From 1f9dd92060628b1946a30546620cc59906782fdd Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 5 Feb 2024 20:40:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=2081822=20=E9=A1=B9=E7=9B=AE=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B--=E5=90=84?=
 =?UTF-8?q?=E9=83=A8=E6=89=80=E4=B8=BB=E7=AE=A1=E7=BA=A7=E9=A2=86=E5=AF=BC?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9=E9=A9=B3=E5=9B=9E=EF=BC=8C?=
 =?UTF-8?q?=E4=B9=9F=E5=87=BA=E7=8E=B0=E9=A9=B3=E5=9B=9E=E7=BB=99=E5=8E=9F?=
 =?UTF-8?q?=E6=9D=A5=E4=BA=BA=E5=91=98=E7=9A=84=E9=97=AE=E9=A2=98=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessProjectAssessService.java  | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
index 528e38fc..33462ce1 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
@@ -509,6 +509,17 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         Task task = processDTO.getTask();
         String executionId = task.getExecutionId();
         ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
+        String assessmentId = processInfoVO.getBusinessId();
+        //查询模块负责人列表
+        LambdaQueryWrapper<ProcessProjectAssessTermUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId);
+        wrapper.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId);
+        List<ProcessProjectAssessTermUser> projectAssessTermUsers = processProjectAssessTermUserService.list(wrapper);
+        List<String> moduleOwnerList = projectAssessTermUsers.stream()
+                .map(ProcessProjectAssessTermUser::getModuleOwner)
+                .filter(Objects::nonNull)
+                .distinct().collect(Collectors.toList());
+
         List<ProcessProjectAssessTerm> processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList();
         List<ProcessProjectAssessTermUser> allTermUserList = new ArrayList<>();
         for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) {
@@ -519,25 +530,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             allTermUserList.add(termUser);
         }
         processProjectAssessTermUserService.updateBatchById(allTermUserList);
-        String assessmentId = processInfoVO.getBusinessId();
 
-
-        LambdaQueryWrapper<ProcessProjectAssessTermUser> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId);
-        wrapper.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId);
-        List<ProcessProjectAssessTermUser> projectAssessTermUsers = processProjectAssessTermUserService.list(wrapper);
-        List<String> moduleOwnerList = projectAssessTermUsers.stream()
-                .map(ProcessProjectAssessTermUser::getModuleOwner)
-                .filter(Objects::nonNull)
-                .distinct().collect(Collectors.toList());
-        ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId);
-        // 完成任务
-        String taskId = processDTO.getTaskId();
-        Map<String, Object> variables = new HashMap<>();
-        variables.put(ProcessProjectAssessCommon.PASS, pass);
-        variables.put(ProcessProjectAssessCommon.MODULE_OWNER_LIST, moduleOwnerList);
-        taskService.complete(taskId, variables);
-        ThreadLocalUtil.remove();
         if (!Objects.equals(userId,originUserId)){
             LambdaQueryWrapper<ProcessProjectAssessTermUser> wrapper1 = new LambdaQueryWrapper<>();
             wrapper1.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId);
@@ -551,7 +544,18 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
                 updateTermUserList.add(termUser);
             }
             processProjectAssessTermUserService.updateBatchById(updateTermUserList);
+            runtimeService.setVariable(executionId,ProcessProjectAssessCommon.MANAGER_LEADER,userId);
         }
+        // 完成任务
+        String taskId = processDTO.getTaskId();
+        Map<String, Object> variables = new HashMap<>();
+        variables.put(ProcessProjectAssessCommon.PASS, pass);
+        if (!pass){
+            runtimeService.setVariable(executionId,ProcessProjectAssessCommon.MODULE_OWNER_LIST,moduleOwnerList);
+        }
+        ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId);
+        taskService.complete(taskId, variables);
+        ThreadLocalUtil.remove();
     }
     //模块负责人修改
     private void mkfzrxgApprove(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO, ProcessDTO processDTO, boolean pass) {