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()));