From 58858931e70eb9e059caeef1251dd8c26111cd8b Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 22 Feb 2024 18:00:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081876=20=E4=BC=81=E6=A0=87=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E6=B5=81=E7=A8=8B--=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E8=81=94=E7=BB=9C=E4=BA=BA=E6=B1=87=E6=80=BB=EF=BC=8C=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/AdviceCreateListener.java        | 29 +++++++++++++++++++
 .../service/impl/EsRevisionServiceImpl.java   |  5 ++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/AdviceCreateListener.java

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/AdviceCreateListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/AdviceCreateListener.java
new file mode 100644
index 00000000..9eb65997
--- /dev/null
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/AdviceCreateListener.java
@@ -0,0 +1,29 @@
+package com.jero.modules.activiti.process.esRevision.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+
+/**
+ * @author: Mzaxd
+ * @Date: 2023/10/10 14:14
+ */
+@Slf4j
+@Component("adviceCreateListener")
+public class AdviceCreateListener implements TaskListener {
+
+    @Resource
+    private TaskService taskService;
+
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        String parentExecutionId = (String) taskService.getVariable(delegateTask.getId(), "contactExecutionId");
+        delegateTask.setVariable(delegateTask.getExecutionId() + "-ContactExecutionId", parentExecutionId);
+    }
+}
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index 2842cba3..be7a3eeb 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -361,6 +361,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
             case CONTACT_USER_COLLECT:
                 // 根据联络人找到部门联络人主管级领导
                 LambdaQueryWrapper<LawsContactManage> contactWrapper = new LambdaQueryWrapper<>();
+                advicesWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
                 contactWrapper.eq(LawsContactManage::getContactId, userId);
                 List<LawsContactManage> list = contactManageService.list(contactWrapper);
                 if (list != null && !list.isEmpty()) {
@@ -519,7 +520,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 List<String> adviceUserList = Arrays.asList(workGroup.split(","));
                 runtimeService.setVariable(executionId, "adviceUserList", adviceUserList);
                 runtimeService.setVariable(executionId, executionId + "-adviceDeadline", data.getAdviceDeadline());
-                runtimeService.setVariable(executionId, contactUser + "-ExecutionId", executionId);
+                runtimeService.setVariable(executionId, "contactExecutionId", executionId);
                 userMap.put("adviceUserList", workGroup);
                 processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);
                 // 设置截止时间
@@ -530,7 +531,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 advices = data.getAdvices();
                 advices.forEach(advice -> advice.setCreateUserId(userId));
                 advices.forEach(advice -> advice.setProcessInstanceId(processInstanceId));
-                String contactUserExecutionId = (String) runtimeService.getVariable(executionId, contactUser + "-ExecutionId");
+                String contactUserExecutionId = (String) runtimeService.getVariable(executionId, executionId + "-ContactExecutionId");
                 advices.forEach(advice -> advice.setExecutionId(contactUserExecutionId));
                 adviceService.saveBatch(advices);
                 break;