update 优化 部分代码与bug

疯狂的狮子Li

2025-01-13 7d82f954acf5e67a9375830b6835a3f211a745c7

update 优化 部分代码与bug

 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java

@@ -107,7 +107,6 @@
                log.info("流程已结束，状态更新为: {}", status);
                return status;
            }
            log.warn("流程未结束，实例ID: {}", instanceId);
            return null;
        }
    }

 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java

@@ -134,8 +134,9 @@
            String[] parts = str.split(StrUtil.COLON, 2);
            if (parts.length < 2) {
                list.addAll(getUsersByType(TaskAssigneeEnum.USER, List.of(Long.valueOf(parts[0]))));
            } else {
                list.addAll(getUsersByType(TaskAssigneeEnum.fromCode(parts[0] + StrUtil.COLON), List.of(Long.valueOf(parts[1]))));
            }
            list.addAll(getUsersByType(TaskAssigneeEnum.fromCode(parts[0] + StrUtil.COLON), List.of(Long.valueOf(parts[1]))));
        }
        return list;
    }

 script/bpmn/leave2.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<definition flowCode="leave2" flowName="请假申请-排他网关" version="2" category="1" formCustom="N" formPath="/workflow/leaveEdit/index">
<definition flowCode="leave2" flowName="请假申请-排他网关" version="1" category="1" formCustom="N" formPath="/workflow/leaveEdit/index">
    <node nodeType="start" nodeCode="cef3895c-f7d8-4598-8bf3-8ec2ef6ce84a" nodeName="开始" nodeRatio="0.000" coordinate="300,240|300,240" skipAnyNode="N" formCustom="N">
        <skip coordinate="320,240;390,240" skipType="PASS">fdcae93b-b69c-498a-b231-09255e74bcbd</skip>
    </node>
@@ -8,8 +8,8 @@
        <skip coordinate="490,240;535,240" skipType="PASS">7b8c7ead-7dc8-4951-a7f3-f0c41995909e</skip>
    </node>
    <node nodeType="serial" nodeCode="7b8c7ead-7dc8-4951-a7f3-f0c41995909e" nodeRatio="0.000" coordinate="560,240" skipAnyNode="N" formCustom="N">
        <skip coordinate="560,265;560,320;670,320" skipType="PASS" skipCondition="@@le@@|leaveDays@@le@@2">b3528155-dcb7-4445-bbdf-3d00e3499e86</skip>
        <skip coordinate="560,215;560,160;670,160|560,187" skipType="PASS" skipName="大于两天" skipCondition="@@gt@@|leaveDays@@gt@@2">5ed2362b-fc0c-4d52-831f-95208b830605</skip>
        <skip coordinate="560,265;560,320;670,320" skipType="PASS" skipCondition="le|leaveDays|2">b3528155-dcb7-4445-bbdf-3d00e3499e86</skip>
        <skip coordinate="560,215;560,160;670,160|560,187" skipType="PASS" skipName="大于两天" skipCondition="gt|leaveDays|2">5ed2362b-fc0c-4d52-831f-95208b830605</skip>
    </node>
    <node nodeType="between" nodeCode="b3528155-dcb7-4445-bbdf-3d00e3499e86" nodeName="组长" permissionFlag="3,4" nodeRatio="0.000" coordinate="720,320|720,320" skipAnyNode="N" formCustom="N">
        <skip coordinate="770,320;860,320;860,280" skipType="PASS">c9fa6d7d-2a74-4e78-b947-0cad8a6af869</skip>

 script/bpmn/leave4.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<definition flowCode="leave4" flowName="请假申请-会签" version="1" category="103" formCustom="N" formPath="/workflow/leaveEdit/index">
<definition flowCode="leave4" flowName="请假申请-会签" version="1" category="1" formCustom="N" formPath="/workflow/leaveEdit/index">
    <node nodeType="start" nodeCode="9ce8bf00-f25b-4fc6-91b8-827082fc4876" nodeName="开始" nodeRatio="0.000" coordinate="320,240|320,240" skipAnyNode="N" formCustom="N">
        <skip coordinate="340,240;410,240" skipType="PASS">e90b98ef-35b4-410c-a663-bae8b7624b9f</skip>
    </node>

 script/bpmn/leave5.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<definition flowCode="leave5" flowName="请假申请-并行会签网关" version="1" category="103" formCustom="N" formPath="/workflow/leaveEdit/index">
<definition flowCode="leave5" flowName="请假申请-并行会签网关" version="1" category="1" formCustom="N" formPath="/workflow/leaveEdit/index">
    <node nodeType="start" nodeCode="ebebaf26-9cb6-497e-8119-4c9fed4c597c" nodeName="开始" nodeRatio="0.000" coordinate="300,220|300,220" skipAnyNode="N" formCustom="N">
        <skip coordinate="320,220;350,220;350,220;340,220;340,220;370,220" skipType="PASS">e1b04e96-dc81-4858-a309-2fe945d2f374</skip>
    </node>