From 3b10fd59f6ecf964f3cdd2c74dceb08fc0519e5b Mon Sep 17 00:00:00 2001 From: cxh Date: Tue, 28 May 2024 14:00:21 +0800 Subject: [PATCH] =?UTF-8?q?update=20list=E5=88=A4=E7=A9=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/SysRoleServiceImpl.java | 5 +++-- .../CustomDefaultProcessDiagramGenerator.java | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java index abd294f3e..e139a8193 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -352,7 +353,7 @@ public class SysRoleServiceImpl implements ISysRoleService { rm.setMenuId(menuId); list.add(rm); } - if (list.size() > 0) { + if (CollectionUtil.isNotEmpty(list)) { rows = roleMenuMapper.insertBatch(list) ? list.size() : 0; } return rows; @@ -373,7 +374,7 @@ public class SysRoleServiceImpl implements ISysRoleService { rd.setDeptId(deptId); list.add(rd); } - if (list.size() > 0) { + if (CollectionUtil.isNotEmpty(list)) { rows = roleDeptMapper.insertBatch(list) ? list.size() : 0; } return rows; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java index e4793a26f..df8881006 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java @@ -13,10 +13,12 @@ package org.dromara.workflow.flowable; +import cn.hutool.core.collection.CollectionUtil; import org.flowable.bpmn.model.Event; import org.flowable.bpmn.model.Process; import org.flowable.bpmn.model.*; import org.flowable.image.ProcessDiagramGenerator; +import org.springframework.util.CollectionUtils; import java.awt.*; import java.awt.image.BufferedImage; @@ -69,9 +71,8 @@ public class CustomDefaultProcessDiagramGenerator implements ProcessDiagramGener } } else { List eventTypeElements = startEvent.getExtensionElements().get("eventType"); - if (eventTypeElements != null && eventTypeElements.size() > 0) { + if (CollectionUtil.isNotEmpty(eventTypeElements)) { processDiagramCanvas.drawEventRegistryStartEvent(graphicInfo, scaleFactor); - } else { processDiagramCanvas.drawNoneStartEvent(graphicInfo); } @@ -350,7 +351,7 @@ public class CustomDefaultProcessDiagramGenerator implements ProcessDiagramGener } else { List eventTypeElements = boundaryEvent.getExtensionElements().get("eventType"); - if (eventTypeElements != null && eventTypeElements.size() > 0) { + if (CollectionUtil.isNotEmpty(eventTypeElements)) { processDiagramCanvas.drawCatchingEventRegistryEvent(flowNode.getName(), graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor); } } @@ -634,7 +635,7 @@ public class CustomDefaultProcessDiagramGenerator implements ProcessDiagramGener } } - if (allGraphicInfos.size() > 0) { + if (CollectionUtil.isNotEmpty(allGraphicInfos)) { boolean needsTranslationX = false; boolean needsTranslationY = false; @@ -752,7 +753,7 @@ public class CustomDefaultProcessDiagramGenerator implements ProcessDiagramGener FlowElement sourceElement = bpmnModel.getFlowElement(sourceRef); FlowElement targetElement = bpmnModel.getFlowElement(targetRef); List graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(sequenceFlow.getId()); - if (graphicInfoList != null && graphicInfoList.size() > 0) { + if (CollectionUtil.isNotEmpty(graphicInfoList)) { graphicInfoList = connectionPerfectionizer(processDiagramCanvas, bpmnModel, sourceElement, targetElement, graphicInfoList); int[] xPoints = new int[graphicInfoList.size()]; int[] yPoints = new int[graphicInfoList.size()];