From 7d82f954acf5e67a9375830b6835a3f211a745c7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 13 一月 2025 19:37:45 +0800
Subject: [PATCH] update 优化 部分代码与bug
---
script/bpmn/leave2.xml | 6 +++---
script/bpmn/leave5.xml | 2 +-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java | 3 ++-
script/bpmn/leave4.xml | 2 +-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java | 1 -
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java
index 29b8b72..35c16bd 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java
+++ b/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;
}
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java
index 2ed6538..5f34866 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java
+++ b/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;
}
diff --git a/script/bpmn/leave2.xml b/script/bpmn/leave2.xml
index 38ec0a9..35d270f 100644
--- a/script/bpmn/leave2.xml
+++ b/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>
diff --git a/script/bpmn/leave4.xml b/script/bpmn/leave4.xml
index 2061d17..578be56 100644
--- a/script/bpmn/leave4.xml
+++ b/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>
diff --git a/script/bpmn/leave5.xml b/script/bpmn/leave5.xml
index d6c0117..a5fc2d2 100644
--- a/script/bpmn/leave5.xml
+++ b/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>
--
Gitblit v1.9.3