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 wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessEsAnnualInit::getApprovalUser, approvalUser); + wrapper.eq(ProcessEsAnnualInit::getExecutionId, contactExecutionId); List 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 data.setExecutionId(executionId)); saveOrUpdateBatch(dataList); + ThreadLocalUtil.put("contactExecutionId", executionId); } else { // 找到所有被驳回的数据,发起新流程 annualInitData.setDataList(dbDataList);