From c4d7f300bf65362e494ccd690d091ffad4070125 Mon Sep 17 00:00:00 2001 From: konbai <1527468660@qq.com> Date: Sun, 27 Feb 2022 16:38:34 +0800 Subject: [PATCH] =?UTF-8?q?fix=20--=20=E4=BF=AE=E5=A4=8D"=E6=88=91?= =?UTF-8?q?=E7=9A=84=E6=B5=81=E7=A8=8B"=E6=B5=81=E7=A8=8B=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FlowTaskServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java index 49163a07..eb53a13a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java @@ -42,6 +42,7 @@ import org.flowable.engine.history.HistoricActivityInstance; import org.flowable.engine.history.HistoricActivityInstanceQuery; import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.history.HistoricProcessInstanceQuery; +import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; import org.flowable.engine.runtime.Execution; import org.flowable.engine.runtime.ProcessInstance; @@ -437,15 +438,14 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask long time = System.currentTimeMillis() - hisIns.getStartTime().getTime(); flowTask.setDuration(getDate(time)); } - // 流程定义信息 - ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() - .processDefinitionId(hisIns.getProcessDefinitionId()) - .singleResult(); - flowTask.setDeployId(processDefinition.getDeploymentId()); + // 流程部署实例信息 + Deployment deployment = repositoryService.createDeploymentQuery() + .deploymentId(hisIns.getDeploymentId()).singleResult(); + flowTask.setDeployId(hisIns.getDeploymentId()); flowTask.setProcDefId(hisIns.getProcessDefinitionId()); - flowTask.setProcDefName(processDefinition.getName()); - flowTask.setProcDefVersion(processDefinition.getVersion()); - flowTask.setCategory(processDefinition.getCategory()); + flowTask.setProcDefName(hisIns.getProcessDefinitionName()); + flowTask.setProcDefVersion(hisIns.getProcessDefinitionVersion()); + flowTask.setCategory(deployment.getCategory()); // 当前所处流程 todo: 本地启动放开以下注释 // List taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).list(); // if (CollectionUtils.isNotEmpty(taskList)) {