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; }