提交 d0ead5c7 编写于 作者: O o2sword

修复流程回溯最后一个人工环节不显示的问题

上级 22c5e70e
......@@ -85,7 +85,7 @@ class ActionListRollbackWithWorkOrWorkCompleted extends BaseAction {
try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
os = emc.fetchEqual(WorkLog.class, Wo.copier, WorkLog.job_FIELDNAME, job).stream()
.filter(o -> (!BooleanUtils.isTrue(o.getSplitting()))
&& (Objects.equals(o.getArrivedActivityType(), ActivityType.manual)))
&& (Objects.equals(o.getFromActivityType(), ActivityType.manual)))
.sorted(Comparator.comparing(WorkLog::getCreateTime, Comparator.nullsLast(Date::compareTo)))
.collect(Collectors.toList());
} catch (Exception e) {
......@@ -203,4 +203,4 @@ class ActionListRollbackWithWorkOrWorkCompleted extends BaseAction {
null);
}
}
\ No newline at end of file
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册