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 6df6d760e..dd73a63b6 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 @@ -56,11 +56,14 @@ public interface BpmnHistoricTaskInstanceConverter extends EntityConverter vos = new ArrayList<>(); entities.stream() - // .filter(i -> !Objects.equals(DELETE_REASON_END, 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())) - || (Objects.equals(i.getAssignee(), TASK_ASSIGNEE_SKIP_FLAT) && Objects.equals(DELETE_REASON_END, i.getDeleteReason())) - ) + .filter(i -> (!Objects.equals(REJECTION_AUTO_COMPLETED.getDesc(), i.getDeleteReason())) + || (Objects.equals(i.getAssignee(), TASK_ASSIGNEE_SKIP_FLAT) && Objects.equals(REJECTION_AUTO_COMPLETED.getDesc(), i.getDeleteReason())) + // || !(Objects.equals(i.getAssignee(), TASK_ASSIGNEE_SKIP_FLAT) && + // Objects.equals(DELETE_REASON_END, 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(DELETE_REASON_END, i.getDeleteReason()))) .forEach(i -> vos.add(toVo(i))); return vos; }