From 8334dad2ed9265f673dc18693b47e283648bd938 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 23 Feb 2024 18:34:00 +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 --- .../esAnnualInit/listener/MainDraftWriteCreateListener.java | 2 +- .../service/impl/ProcessEsAnnualInitServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/MainDraftWriteCreateListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/MainDraftWriteCreateListener.java index 89562ea6..70a1d60e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/MainDraftWriteCreateListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/MainDraftWriteCreateListener.java @@ -32,6 +32,6 @@ public class MainDraftWriteCreateListener implements TaskListener { @Override public void notify(DelegateTask delegateTask) { String parentExecutionId = (String) taskService.getVariable(delegateTask.getId(), "parentExecutionId"); - delegateTask.setVariable("parentExecutionId", parentExecutionId); + delegateTask.setVariableLocal("parentExecutionId", parentExecutionId); } } 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 b28cb21a..821cf8db 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 @@ -245,7 +245,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); String taskName = task.getName(); - String parentExecutionId = (String) taskService.getVariable(taskId, "parentExecutionId"); + String parentExecutionId = (String) taskService.getVariableLocal(taskId, "parentExecutionId"); switch (taskName) { case CONTACT_USER_SELECT: case MAIN_DRAFT_LEADER_APPROVAL_DISTRIBUTE: @@ -393,7 +393,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl d.setMainDraftingUser(userId)); - saveOrUpdateBatch(dataList); + updateBatchById(dataList); // 找出所有主起草人 Set mainDraftUserSet = new HashSet<>(); dataList.forEach(d -> mainDraftUserSet.add(d.getMainDraftingUser()));