From 11d16531db1b7825ddd613ecd807e4f6240cff8a Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 13 Dec 2023 15:13:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=90=84=E9=83=A8=E9=97=A8=E4=B8=BB=E5=8A=A8=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E4=B8=A2=E5=A4=B1=E4=B8=8A=E7=BA=A7=E4=BA=BABUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsAnnualReportServiceImpl.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 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 f58d8155..7efc4ce2 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
@@ -168,6 +168,8 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                     List<String> workGroupUserList = StrUtil.split(workGroupUsers, ',');
                     // 设置流程变量
                     taskService.setVariable(taskId, "workGroupUserList", workGroupUserList);
+                    // 将联络人主管级上一级领导保存到流程变量中
+                    taskService.setVariable(taskId, contactUser + "-ContactUserLeaderLeader", contactUserLeaderLeader);
                 } else {
                     // 保存联络人主管级上级领导
                     dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader));
@@ -187,11 +189,13 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                 remove(wrapper);
                 annualReport = annualReportDataVO.getDataList().get(0);
                 String collectUserLeader = annualReport.getCollectUserLeader();
+                contactUserLeaderLeader = annualReport.getContactUserLeaderLeader();
                 dataList.forEach(data -> data.setContactUser(contactUser));
                 dataList.forEach(data -> data.setExecutionId(executionId));
                 dataList.forEach(data -> data.setProcessInstanceId(processInstanceId));
                 // 保存收集联络人主管级领导
                 dataList.forEach(data -> data.setCollectUserLeader(collectUserLeader));
+                dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader));
                 dataList.forEach(data -> data.setWorkGroupUser(workGroupUser));
                 saveBatch(dataList);
                 // 设置下一个节点的审批人流程变量
@@ -202,8 +206,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                 wrapper.eq(ProcessEsAnnualReport::getContactUser, contactUser);
                 wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
                 remove(wrapper);
-                annualReport = annualReportDataVO.getDataList().get(0);
-                contactUserLeaderLeader = annualReport.getContactUserLeaderLeader();
+                contactUserLeaderLeader = (String) runtimeService.getVariable(executionId, contactUser + "-ContactUserLeaderLeader");
                 dataList.forEach(data -> data.setExecutionId(executionId));
                 dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader));
                 taskService.setVariable(taskId, "contactUserLeaderLeader", contactUserLeaderLeader);