From 0fbb34db832b86704179353640100752b0192131 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 25 Dec 2023 17:20:56 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=A4=84=E7=90=86=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=9A=84"=E4=B8=9A=E5=8A=A1=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA"=E7=9A=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../converter/BpmnHistoricTaskInstanceConverter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 aeccee78d..23407337e 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,9 +13,7 @@ import java.util.Collections; import java.util.List; import java.util.Objects; -import static cn.axzo.workflow.common.constant.BpmnConstants.DUMMY_ASSIGNEE_ID; import static cn.axzo.workflow.common.constant.BpmnConstants.TASK_ASSIGNEE_SKIP_FLAT; -import static cn.axzo.workflow.core.common.enums.BpmnProcessTaskResultEnum.DELETE_MI_EXECUTION; import static cn.axzo.workflow.core.common.enums.BpmnProcessTaskResultEnum.MI_END; import static cn.axzo.workflow.core.common.enums.BpmnProcessTaskResultEnum.REJECTION_AUTO_COMPLETED; import static org.mapstruct.NullValueCheckStrategy.ALWAYS; @@ -60,7 +58,9 @@ public interface BpmnHistoricTaskInstanceConverter extends EntityConverter (!Objects.equals(REJECTION_AUTO_COMPLETED.getDesc(), i.getDeleteReason())) || (Objects.equals(i.getAssignee(), TASK_ASSIGNEE_SKIP_FLAT) && Objects.equals(REJECTION_AUTO_COMPLETED.getDesc(), i.getDeleteReason())) ).filter(i -> !(!Objects.equals(i.getAssignee(), TASK_ASSIGNEE_SKIP_FLAT) && Objects.equals(MI_END.getStatus(), i.getDeleteReason()))) - .filter(i -> !(Objects.equals(i.getAssignee(), DUMMY_ASSIGNEE_ID) && Objects.equals(DELETE_MI_EXECUTION.getStatus(), i.getDeleteReason()))) + // FIXME 如果放开这里的过滤, 会导致任务列表中有多余的任务, 这个多余的任务是"业务指定审批人"的节点, 需要与产品确认后再处理 + // .filter(i -> !(Objects.equals(i.getAssignee(), DUMMY_ASSIGNEE_ID) && Objects.equals + // (DELETE_MI_EXECUTION.getStatus(), i.getDeleteReason()))) .forEach(i -> vos.add(toVo(i))); return vos; }