From cd9ff1692e4956b6d58d5b4c92e5af73ea800e7e Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 23 Feb 2024 10:30:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2081873=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(=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E5=8F=91=E8=B5=B7)--=E4=B8=8D=E5=90=8C=E7=9A=84?= =?UTF-8?q?=E4=B8=BB=E8=B5=B7=E8=8D=89=E5=8D=95=E4=BD=8D=E4=B8=BB=E7=AE=A1?= =?UTF-8?q?=E7=BA=A7=E9=A2=86=E5=AF=BC=E5=AE=A1=E6=89=B9=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=EF=BC=8C=E7=9B=B8=E5=90=8C=E7=9A=84=E4=B8=BB=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E4=BA=BA=E5=A1=AB=E5=86=99=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=AC=AC?= =?UTF-8?q?2=E4=B8=AA=E5=A4=84=E7=90=86=E7=9A=84=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=88=E5=B9=B6=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/ContactUserDistributeCreateListener.java | 1 + .../listener/MainDraftLeaderDistributeCreateListener.java | 1 + 2 files changed, 2 insertions(+) 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);