From c5dee34d471166a5c3baa24bff1340ada30d8ee0 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 12 Dec 2023 09:48:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=84=E9=83=A8=E9=97=A8=E4=B8=BB?=
 =?UTF-8?q?=E5=8A=A8=E4=B8=8A=E6=8A=A5=E6=B5=81=E7=A8=8B=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E4=B8=AA=E8=8A=82=E7=82=B9=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsAnnualReportServiceImpl.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 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 34e095ef..e3e5393a 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
@@ -151,9 +151,10 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         String taskName = task.getName();
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
+        ProcessEsAnnualReport annualReport;
         switch (taskName) {
             case CONTACT_USER_DISTRIBUTE:
-                ProcessEsAnnualReport annualReport = annualReportDataVO.getDataList().get(0);
+                annualReport = annualReportDataVO.getDataList().get(0);
                 boolean distribute = annualReport.getDistributeFlag().equals("1");
                 String contactUserLeaderLeader = annualReport.getContactUserLeaderLeader();
                 taskService.setVariable(taskId, "distribute", distribute);
@@ -178,16 +179,18 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                 }
                 break;
             case WORK_GROUP_COLLECT:
+                annualReport = annualReportDataVO.getDataList().get(0);
+                String collectUserLeader = annualReport.getCollectUserLeader();
                 String executionId = task.getExecutionId();
                 String contactUser = (String) runtimeService.getVariable(executionId, "contactUser");
                 dataList.forEach(data -> data.setContactUser(contactUser));
                 dataList.forEach(data -> data.setExecutionId(executionId));
                 // 保存收集联络人主管级领导
-                dataList.forEach(data -> data.setCollectUserLeader((String) flowUserVO.get("collectUserLeader")));
+                dataList.forEach(data -> data.setCollectUserLeader(collectUserLeader));
                 dataList.forEach(data -> data.setWorkGroupUser(UserUtils.getUserId()));
                 saveBatch(dataList);
                 // 设置下一个节点的审批人流程变量
-                taskService.setVariableLocal(taskId, "collectUserLeader", flowUserVO.get("collectUserLeader"));
+                taskService.setVariable(taskId, "collectUserLeader", collectUserLeader);
                 break;
             case CONTACT_USER_COLLECT:
                 // 先删后增