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