From e8fd107bb41a163c6e997e22c1d50cafd3db2bc2 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 13 Dec 2023 11:20:14 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E6=9B=B4=E6=96=B0=E5=A5=97?= =?UTF-8?q?=E5=A8=83=E4=BC=BC=E5=BE=97=E7=9A=84=E8=BD=AC=E4=BA=A4=E4=B8=8E?= =?UTF-8?q?=E5=8A=A0=E7=AD=BE=E5=90=8E,=E5=AE=A1=E6=89=B9=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E5=B8=B8=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BpmnHistoricTaskInstanceConverter.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 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 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; }