From 03bb49538c4756c2394ae30998d238fdf83d5517 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 20 Feb 2024 11:16:24 +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=E4=B8=A4=E4=B8=AA=E5=88=86=E6=94=AF=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=A2=AB=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/MainDraftLeaderDistributeCreateListener.java     | 4 ++++
 .../service/impl/ProcessEsAnnualInitServiceImpl.java          | 1 +
 2 files changed, 5 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/MainDraftLeaderDistributeCreateListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/MainDraftLeaderDistributeCreateListener.java
index 876836fe..48f5149a 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/MainDraftLeaderDistributeCreateListener.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/MainDraftLeaderDistributeCreateListener.java
@@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.esAnnualInit.listener;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit;
 import com.jero.modules.activiti.process.esAnnualInit.service.impl.ProcessEsAnnualInitServiceImpl;
+import com.jero.modules.activiti.util.ThreadLocalUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -29,12 +30,15 @@ public class MainDraftLeaderDistributeCreateListener implements TaskListener {
      */
     @Override
     public void notify(DelegateTask delegateTask) {
+        String contactExecutionId = (String) ThreadLocalUtil.get("contactExecutionId");
         String executionId = delegateTask.getExecutionId();
         String approvalUser = (String) delegateTask.getVariable("approvalUser");
         LambdaQueryWrapper<ProcessEsAnnualInit> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ProcessEsAnnualInit::getApprovalUser, approvalUser);
+        wrapper.eq(ProcessEsAnnualInit::getExecutionId, contactExecutionId);
         List<ProcessEsAnnualInit> list = annualInitService.list(wrapper);
         list.forEach(l -> l.setExecutionId(executionId));
         annualInitService.updateBatchById(list);
+        ThreadLocalUtil.remove();
     }
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
index 04c2ea31..7afb4d12 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
@@ -323,6 +323,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                     processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);
                     dataList.forEach(data -> data.setExecutionId(executionId));
                     saveOrUpdateBatch(dataList);
+                    ThreadLocalUtil.put("contactExecutionId", executionId);
                 } else {
                     // 找到所有被驳回的数据，发起新流程
                     annualInitData.setDataList(dbDataList);