From 4595470f80908bd8311ec30fb46c532b7306c4d8 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 3 Jan 2024 11:35:17 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E8=B0=83=E6=95=B4=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=AE=A1=E6=89=B9=E6=97=A5=E5=BF=97=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/engine/cmd/CustomAbortProcessInstanceCmd.java | 3 ++- .../service/converter/BpmnHistoricTaskInstanceConverter.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomAbortProcessInstanceCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomAbortProcessInstanceCmd.java index 5b41d9bea..a902fde3b 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomAbortProcessInstanceCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomAbortProcessInstanceCmd.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import static cn.axzo.workflow.common.constant.BpmnConstants.HIDDEN_ASSIGNEE_ID; import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_DELETE_PROCESS_FLAG; import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_END_TENANT_ID; import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_END_USER_ID; @@ -85,7 +86,7 @@ public class CustomAbortProcessInstanceCmd implements Command, Serializabl .forEach(i -> taskService.complete(i.getId())); } - runtimeService.deleteProcessInstance(processInstanceId, reason); + runtimeService.deleteProcessInstance(processInstanceId, HIDDEN_ASSIGNEE_ID); // 添加自定义的节点,用于展示最后的操作 CustomTaskHelper.createVirtualTask(commandContext, processInstanceId, "系统终止", "system_abort_node", reason); diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmnHistoricTaskInstanceConverter.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmnHistoricTaskInstanceConverter.java index a3e55ebc2..115636b7a 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmnHistoricTaskInstanceConverter.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmnHistoricTaskInstanceConverter.java @@ -54,6 +54,7 @@ public interface BpmnHistoricTaskInstanceConverter extends EntityConverter vos = new ArrayList<>(); entities.stream() .filter(i -> !Objects.equals(i.getAssignee(), HIDDEN_ASSIGNEE_ID)) + .filter(i -> !Objects.equals(i.getDeleteReason(), HIDDEN_ASSIGNEE_ID)) .forEach(i -> vos.add(toVo(i))); return vos; }