diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowServiceImpl.java b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowServiceImpl.java index f440e04..0b38d6b 100644 --- a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowServiceImpl.java +++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowServiceImpl.java @@ -246,7 +246,8 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService { public List queryKnowledgeFlowRecord(String knowledgeId, String flowId) { List list = knowledgeFlowRecordService.lambdaQuery().eq(KnowledgeFlowRecord::getKnowledgeId, knowledgeId) .eq(StrUtil.isNotBlank(flowId), KnowledgeFlowRecord::getFlowId, flowId).list(); - List result = list.stream().sorted(Comparator.comparingInt(KnowledgeFlowRecord::getFlowRuleOrder)).map(knowledgeFlowRecord -> { + // 根据时间进行排序 + List result = list.stream().map(knowledgeFlowRecord -> { KnowledgeFlowRecordResVO node = new KnowledgeFlowRecordResVO(); node.setKnowledgeId(knowledgeFlowRecord.getKnowledgeId()); node.setProcessName(knowledgeFlowRecord.getProcessName()); @@ -264,7 +265,7 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService { } return node; - }).toList(); + }).sorted(Comparator.comparing(KnowledgeFlowRecordResVO::getProcessTime)).toList(); // 然后把人名和部门名进行转换 Set userIdSet = result.stream().map(KnowledgeFlowRecordResVO::getProcessUserId).collect(Collectors.toSet()); List systemUsers = systemUserService.listByIds(userIdSet);