From 7513d898c2f588151a29b2436546f31b0dd13afd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 08 四月 2025 13:40:04 +0800
Subject: [PATCH] 修改flow基础代码

---
 lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowDefinitionServiceImpl.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowDefinitionServiceImpl.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowDefinitionServiceImpl.java
index 1efec6c..bbb90bc 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowDefinitionServiceImpl.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowDefinitionServiceImpl.java
@@ -311,6 +311,15 @@
             String serviceImplName = business.getServiceImplName();
             FlowCallBackServiceI flowCallBackService = (FlowCallBackServiceI) SpringContextUtils.getBean(serviceImplName);
             List<String> beforeParamsCandidateUsernames = flowCallBackService.flowCandidateUsernamesOfTask(task2.getTaskDefinitionKey(), variables);
+            business.setProcessDefinitionId(procDefId)
+                    .setProcessInstanceId(processInstance.getProcessInstanceId())
+////                    .setActStatus(ActStatus.start)
+                    .setProposer(sysUser.getUsername())
+                    .setTaskId(task2.getId())
+                    .setTaskName(nextTask.getName())
+                    .setTaskNameId(nextTask.getId())
+                    .setPriority(nextTask.getPriority())
+                    .setDoneUsers(doneUserList.toJSONString());
             if (CollUtil.isNotEmpty(beforeParamsCandidateUsernames)){
                 // 鍒犻櫎鍚庨噸鍐�
                 for (Task task2One : task2List) {
@@ -325,19 +334,10 @@
                     }
                 }
                 business.setTodoUsers(JSON.toJSONString(beforeParamsCandidateUsernames));
+            }else {
+                // 涓氬姟灞傛病鏈夋寚瀹氬�欓�変汉锛岀洿鎺ヨ鐩�
+                business.setTodoUsers(JSON.toJSONString(collect_username));
             }
-
-            business.setProcessDefinitionId(procDefId)
-                    .setProcessInstanceId(processInstance.getProcessInstanceId())
-////                    .setActStatus(ActStatus.start)
-                    .setProposer(sysUser.getUsername())
-                    .setTaskId(task2.getId())
-                    .setTaskName(nextTask.getName())
-                    .setTaskNameId(nextTask.getId())
-                    .setPriority(nextTask.getPriority())
-                    .setDoneUsers(doneUserList.toJSONString())
-                    .setTodoUsers(JSON.toJSONString(collect_username))
-            ;
         } else {
         //    **娌℃湁涓嬩竴涓妭鐐癸紝娴佺▼宸茬粡缁撴潫浜�
             business.setProcessDefinitionId(procDefId)

--
Gitblit v1.9.3