wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 更新套娃似得的转交与加签后,审批日志显示不正常的情况

Browse Source
This commit is contained in:
wangli 2023-12-13 10:32:21 +08:00
parent 7a369a42a9
commit 127ea98cae
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmnHistoricTaskInstanceConverter.java
View File

@ -56,8 +56,11 @@ public interface BpmnHistoricTaskInstanceConverter extends EntityConverter<BpmnH
}
List<BpmnHistoricTaskInstanceVO> 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())))
// .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()))
)
.forEach(i -> vos.add(toVo(i)));
return vos;
}