From 9e590d01e001fad374ec2fc3b260ac7623c4479c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Tue, 16 Jul 2024 11:52:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B8=85=E5=8D=95=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=B5=81=E7=A8=8B=E5=8A=A0=E7=AD=BE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ocessMarketStandardReleaseServiceImpl.java | 21 ++++++++-----------
 .../activiti/service/ProcessAllService.java   |  2 +-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
index 4536b845..f2a140d8 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
@@ -129,9 +129,8 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
         Map<String, Object> map = new HashMap<>();
         // 人员信息
         userInfoMap.forEach((key, value) -> {
-            if(Objects.equals("moreUserList",key)){
-                map.put(key, Arrays.asList(value.toString().split(",")));
-            }else if(Objects.equals("checkUserLeader1List",key + "List")
+            if(Objects.equals("moreUserList",key + "List")
+                    || Objects.equals("checkUserLeader1List",key + "List")
                     || Objects.equals("checkUserLeader2List",key + "List")){
                 map.put(key, value);
                 map.put(key + "List", Arrays.asList(value.toString().split(",")));
@@ -208,14 +207,8 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
         }
 
         runtimeService.setVariable(processInstanceId, PASS, pass);
-        // 判断任务是否为委托状态
-        if (task != null && task.getDelegationState() == DelegationState.PENDING) {
-            // 任务处于委托状态，应使用resolveTask方法
-            taskService.resolveTask(taskId);
-        } else {
-            // 审批节点
-            actFlowCommonService.completeTask(taskId, userId);
-        }
+        // 审批节点
+        actFlowCommonService.completeTask(taskId, userId);
         // 保存快照
         // 获取流程通用数据
         ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
@@ -301,12 +294,16 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
     @Override
     public void checkProcessStatus(String id) {
         LambdaQueryWrapper<ProcessMarketStandardRelease> queryWrapperMarketStandardRelease = new LambdaQueryWrapper<>();
-        queryWrapperMarketStandardRelease.select(ProcessMarketStandardRelease::getProcessInstanceId);
         queryWrapperMarketStandardRelease.eq(ProcessMarketStandardRelease::getManifestId,id);
         List<ProcessMarketStandardRelease> listProcessMarketStandardRelease = list(queryWrapperMarketStandardRelease);
         if(CollectionUtils.isEmpty(listProcessMarketStandardRelease)){
             return;
         }
+        List<ProcessMarketStandardRelease> listStream = listProcessMarketStandardRelease.stream().filter(o->
+                !StringUtils.isBlank(o.getProcessInstanceId())).collect(Collectors.toList());
+        if(CollectionUtils.isEmpty(listStream)){
+            return;
+        }
         List<String> listProcessInstanceId = listProcessMarketStandardRelease.stream()
                 .map(ProcessMarketStandardRelease::getProcessInstanceId).collect(Collectors.toList());
         LambdaQueryWrapper<ProcessAll> queryProcessAll = new LambdaQueryWrapper<>();
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
index e478f7ee..15180009 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
@@ -295,7 +295,7 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
 
 
     }
-
+    @Transactional(rollbackFor = JeroBootException.class)
     public void delegateTask(DelegateTaskParam param) {
         String taskId = param.getTaskId();
         String userId = param.getUserId();