From ccea7bbc08d214d5445a2ce25068ae16067c176f Mon Sep 17 00:00:00 2001 From: wangli Date: Sun, 10 Dec 2023 15:23:57 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E6=B5=8B=E8=AF=95=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=AD=90=E4=BB=BB=E5=8A=A1=E6=97=B6,=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=88=B6=E4=BB=BB=E5=8A=A1=E7=9A=84=20ExecutionId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/converter/BpmnHistoricTaskInstanceConverter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 d311dbe72..d16d2f0a8 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 @@ -13,6 +13,7 @@ import java.util.Collections; import java.util.List; import java.util.Objects; +import static cn.axzo.workflow.common.constant.BpmnConstants.TASK_ASSIGNEE_SKIP_FLAT; import static cn.axzo.workflow.core.common.enums.BpmnProcessTaskResultEnum.REJECTION_AUTO_COMPLETED; import static org.mapstruct.NullValueCheckStrategy.ALWAYS; @@ -56,7 +57,7 @@ public interface BpmnHistoricTaskInstanceConverter extends EntityConverter vos = new ArrayList<>(); entities.stream() .filter(i -> !Objects.equals(DELETE_REASON_END, i.getDeleteReason())) - .filter(i -> !Objects.equals(REJECTION_AUTO_COMPLETED.getDesc(), i.getDeleteReason())) + .filter(i -> (Objects.equals(i.getAssignee(), TASK_ASSIGNEE_SKIP_FLAT) && Objects.equals(REJECTION_AUTO_COMPLETED.getDesc(), i.getDeleteReason())) || (!Objects.equals(REJECTION_AUTO_COMPLETED.getDesc(), i.getDeleteReason()))) .forEach(i -> vos.add(toVo(i))); return vos; }