From d523ab2944ee3e35cffbff82c71695169ce56c84 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 7 Dec 2023 20:23:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2-=E4=B8=BB=E5=8A=A8=E4=B8=8A=E6=8A=A5=20=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E4=B8=AA=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsAnnualReportServiceImpl.java     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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 0a572903..e7132d4b 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
@@ -116,7 +116,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         CommonVO commonVO = annualReportData.getCommonVO();
         Map<String, Object> flowUser = annualReportData.getFlowUser();
         actFlowCommonService.putIfNotNull(actVariables, "contactUserList",
-                Optional.ofNullable((String)flowUser.get("contactUserList"))
+                Optional.ofNullable((String) flowUser.get("contactUserList"))
                         .map(s -> Arrays.asList(s.split(",")))
                         .orElse(null));
         actVariables.put("standardEngineer", flowUser.get("standardEngineer"));
@@ -151,17 +151,19 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
         switch (taskName) {
             case CONTACT_USER_DISTRIBUTE:
-                boolean distribute = (boolean) flowUserVO.get("distribute");
+                ProcessEsAnnualReport annualReport = annualReportDataVO.getDataList().get(0);
+                boolean distribute = annualReport.getDistributeFlag().equals("1");
+                String contactUserLeaderLeader = annualReport.getContactUserLeaderLeader();
                 taskService.setVariableLocal(taskId, "distribute", distribute);
                 // 获取是否分发
                 if (distribute) {
-                    String workGroupUsers = (String)flowUserVO.get("workGroupUserList");
+                    String workGroupUsers = annualReport.getWorkGroupUser();
                     // 将workGroupUserList从逗号拼接转为List
                     List<String> workGroupUserList = StrUtil.split(workGroupUsers, ',');
                     // 设置流程变量
                     taskService.setVariableLocal(taskId, "workGroupUserList", workGroupUserList);
-                }else {
-                    String contactUserLeaderLeader = (String)flowUserVO.get("contactUserLeaderLeader");
+                    taskService.setVariableLocal(taskId, "contactUserLeaderLeader", contactUserLeaderLeader);
+                } else {
                     // 保存联络人主管级上级领导
                     dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader));
                     // 不分发，入库存表
@@ -174,7 +176,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                 String contactUser = (String) runtimeService.getVariable(executionId, "contactUser");
                 dataList.forEach(data -> data.setContactUser(contactUser));
                 // 保存收集联络人主管级领导
-                dataList.forEach(data -> data.setCollectUserLeader((String)flowUserVO.get("collectUserLeader")));
+                dataList.forEach(data -> data.setCollectUserLeader((String) flowUserVO.get("collectUserLeader")));
                 dataList.forEach(data -> data.setWorkGroupUser(UserUtils.getUserId()));
                 saveBatch(dataList);
                 // 设置下一个节点的审批人流程变量