diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/ContactUserDistributeCreateListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/ContactUserDistributeCreateListener.java index 8fa23b0b..16a826d4 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/ContactUserDistributeCreateListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/ContactUserDistributeCreateListener.java @@ -33,6 +33,7 @@ public class ContactUserDistributeCreateListener implements TaskListener { String contactUser = (String) delegateTask.getVariable("contactUser"); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser); + wrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, delegateTask.getProcessInstanceId()); List list = annualInitService.list(wrapper); list.forEach(l -> l.setExecutionId(executionId)); annualInitService.updateBatchById(list); 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 2ba7df09..36a4ed15 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 @@ -40,6 +40,7 @@ public class MainDraftLeaderDistributeCreateListener implements TaskListener { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessEsAnnualInit::getApprovalUser, approvalUser); wrapper.eq(ProcessEsAnnualInit::getExecutionId, contactExecutionId); + wrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, delegateTask.getProcessInstanceId()); List list = annualInitService.list(wrapper); list.forEach(l -> l.setExecutionId(executionId)); annualInitService.updateBatchById(list);