From cfb2b64793e594066b41d90e6c7d2d8dd3068031 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 18 Dec 2023 11:14:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=BB=E5=8A=A8=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=8D=E5=88=86=E5=8F=91=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsAnnualInitServiceImpl.java  | 28 ++++++++++++-------
 .../ProcessEsAnnualReportServiceImpl.java     |  2 +-
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
index 97fd41b3..46d9ae6d 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
@@ -107,8 +107,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         CommonVO commonVO = annualInitData.getCommonVO();
         // 当前用户Id
         String userId = UserUtils.getUserId();
-        // 人员数据
-        Map<String, Object> variables = annualInitData.getFlowUser();
         // 业务数据
         List<ProcessEsAnnualInit> dataList = annualInitData.getDataList();
         // 设置流程变量
@@ -125,7 +123,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         // 自动完成第一个任务
         actFlowCommonService.autoCompleteFirstTask(userId, processInstanceId, processDefinitionId, commonVO);
         // 保存选人信息
-        processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables));
+        processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(actVariables));
         // 保存数据
         dataList.forEach(data -> data.setProcessInstanceId(processInstanceId));
         saveBatch(dataList);
@@ -163,13 +161,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
 
     private Map<String, Object> getUserMap(Map<String, Object> variables) {
         // 转成逗号拼接
-        variables.put("contactUserList", Optional.ofNullable((List<String>) variables.get("contactUserList"))
-                .map(list -> String.join(",", list))
-                .orElse(""));
-        variables.put("approvalUserList", Optional.ofNullable((List<String>) variables.get("approvalUserList"))
-                .map(list -> String.join(",", list))
-                .orElse(""));
-        variables.put("mainDraftUserList", Optional.ofNullable((List<String>) variables.get("mainDraftUserList"))
+        variables.put("contactUserList", Optional.ofNullable((HashSet<String>) variables.get("contactUserList"))
                 .map(list -> String.join(",", list))
                 .orElse(""));
         return variables;
@@ -274,6 +266,10 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         updateWrapper.eq(ProcessEsAnnualInit::getDelFlag, YesOrNoEnum.NO.getValue());
         String contactUser = (String) runtimeService.getVariable(executionId, "contactUser");
         String approvalUser = (String) runtimeService.getVariable(executionId, "approvalUser");
+        // 获取当前流程
+        ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+        String processDefinitionId = processInstance.getProcessDefinitionId();
+        Map<String, Object> userMap = new HashMap<>();
         switch (taskName) {
             case CONTACT_USER_SELECT:
                 dataList = annualInitData.getDataList();
@@ -283,6 +279,9 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                     Set<String> approvalUserSet = new HashSet<>();
                     dataList.forEach(d -> approvalUserSet.add(d.getApprovalUser()));
                     taskService.setVariable(taskId, "approvalUserList", approvalUserSet);
+                    // 保存人员
+                    userMap.put("approvalUserList", String.join(",", approvalUserSet));
+                    processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap);
                     dataList.forEach(data -> data.setExecutionId(executionId));
                     saveOrUpdateBatch(dataList);
                 } else {
@@ -314,6 +313,9 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                     dataList.forEach(d -> mainDraftUserSet.add(d.getPrcMainDraftUser()));
                     dataList.forEach(data -> data.setExecutionId(executionId));
                     taskService.setVariable(taskId, "mainDraftUserList", mainDraftUserSet);
+                    // 保存人员
+                    userMap.put("mainDraftUserList", String.join(",", mainDraftUserSet));
+                    processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap);
                 } else {
                     // 找到对应数据，然后设置驳回标志位
                     updateWrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser);
@@ -333,6 +335,12 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                 dataList = annualInitData.getDataList();
                 dataList.forEach(d -> d.setMainDraftingUser(userId));
                 saveOrUpdateBatch(dataList);
+                // 找出所有主起草人
+                Set<String> mainDraftUserSet = new HashSet<>();
+                dataList.forEach(d -> mainDraftUserSet.add(d.getMainDraftingUser()));
+                // 保存人员
+                userMap.put("mainDraftUser", String.join(",", mainDraftUserSet));
+                processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);
                 break;
             case CONTACT_USER_COLLECT:
                 dataList = annualInitData.getDataList();
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
index 929e9c45..461b7e52 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
@@ -180,7 +180,6 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                     // 设置流程变量
                     taskService.setVariable(taskId, "workGroupUserList", workGroupUserList);
                     // 将联络人主管级上一级领导保存到流程变量中
-                    taskService.setVariable(taskId, contactUser + "-ContactUserLeaderLeader", contactUserLeaderLeader);
                     userVariable.put("workGroupUserList", workGroupUsers);
                     userVariable.put("contactUser", contactUser);
                 } else {
@@ -193,6 +192,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                     saveBatch(dataList);
                     taskService.setVariable(taskId, "contactUserLeaderLeader", contactUserLeaderLeader);
                 }
+                taskService.setVariable(taskId, contactUser + "-ContactUserLeaderLeader", contactUserLeaderLeader);
                 userVariable.put("contactUserLeaderLeader", contactUserLeaderLeader);
                 processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userVariable);
                 break;