From 40e95fbc71bca724f5c9dbb756580344d8fb85e0 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 20 Feb 2024 16:12:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B=E4=B8=BB=E8=B5=B7=E8=8D=89=E4=BA=BA?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E4=BF=A1=E6=81=AF=E8=8A=82=E7=82=B9=E4=B8=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AEBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/MainDraftWriteCreateListener.java | 12 +++++++++--- .../service/impl/ProcessEsAnnualInitServiceImpl.java | 4 ++-- 2 files changed, 11 insertions(+), 5 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 2cc4bb19..89562ea6 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 @@ -2,10 +2,14 @@ package com.jero.modules.activiti.process.esAnnualInit.listener; import com.jero.modules.activiti.util.ThreadLocalUtil; import lombok.extern.slf4j.Slf4j; +import org.activiti.engine.RuntimeService; +import org.activiti.engine.TaskService; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.runtime.Execution; import org.springframework.stereotype.Component; +import javax.annotation.Resource; /** @@ -16,6 +20,9 @@ import org.springframework.stereotype.Component; @Component("mainDraftWriteCreateListener") public class MainDraftWriteCreateListener implements TaskListener { + @Resource + private TaskService taskService; + /** * 流程结束之后需要把数据存入企标计划数据库 @@ -24,8 +31,7 @@ public class MainDraftWriteCreateListener implements TaskListener { */ @Override public void notify(DelegateTask delegateTask) { - String parentExecutionId = (String) ThreadLocalUtil.get("parentExecutionId"); - delegateTask.setVariableLocal("parentExecutionId", parentExecutionId); - ThreadLocalUtil.remove(); + String parentExecutionId = (String) taskService.getVariable(delegateTask.getId(), "parentExecutionId"); + delegateTask.setVariable("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 7afb4d12..80b58f11 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 @@ -251,7 +251,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); String taskName = task.getName(); - String parentExecutionId = (String) taskService.getVariableLocal(taskId, "parentExecutionId"); + String parentExecutionId = (String) taskService.getVariable(taskId, "parentExecutionId"); switch (taskName) { case CONTACT_USER_SELECT: case MAIN_DRAFT_LEADER_APPROVAL_DISTRIBUTE: @@ -341,7 +341,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl data.setExecutionId(executionId)); saveOrUpdateBatch(dataList); taskService.setVariable(taskId, "mainDraftUserList", mainDraftUserSet); - ThreadLocalUtil.put("parentExecutionId", executionId); + taskService.setVariable(taskId, "parentExecutionId", executionId); // 保存人员 userMap.put("mainDraftUserList", String.join(",", mainDraftUserSet)); processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);