From bf48f6b29b6411f313bdad4a98dfb3c879e37653 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 6 Feb 2024 09:36:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081816=20=E5=B9=B4=E5=BA=A6=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92(=E5=90=84=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E4=B8=BB=E5=8A=A8=E4=B8=8A=E6=8A=A5)=EF=BC=88?=
 =?UTF-8?q?=E8=81=94=E7=BB=9C=E4=BA=BA=E4=B8=BB=E7=AE=A1=E7=BA=A7=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E7=BA=A7=E9=A2=86=E5=AF=BC=E5=AE=A1=E6=89=B9=EF=BC=89?=
 =?UTF-8?q?=20=E9=A9=B3=E5=9B=9E=E5=90=8E=E8=8A=82=E7=82=B9=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE?=
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 3f08bc16..baa57586 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
@@ -208,6 +208,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         String contactUserLeaderLeader;
         LambdaQueryWrapper<ProcessEsAnnualReport> wrapper = new LambdaQueryWrapper<>();
         Map<String, Object> userVariable = new HashMap<>();
+        runtimeService.setVariableLocal(processInstanceId, "pass", pass);
         switch (taskName) {
             case CONTACT_USER_DISTRIBUTE:
                 annualReport = annualReportDataVO.getDataList().get(0);
@@ -295,10 +296,12 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                     processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userVariable);
                 }
                 // 转办
-                runtimeService.setVariable(executionId, "contactUserLeaderLeader", UserUtils.getUserId());
+                String curLeader = UserUtils.getUserId();
+                taskService.setVariable(taskId, contactUser + "-ContactUserLeaderLeader", curLeader);
+                userVariable.put("contactUserLeaderLeader", curLeader);
+                processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userVariable);
                 break;
         }
-        runtimeService.setVariableLocal(processInstanceId, "pass", pass);
         // 更新审批表为完成，填充数据
         actFlowCommonService.updateApprovalInfo(commonVO, taskId, pass);
         // 审批节点