diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java
index 750a735295..64f65e94ee 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java
@@ -56,6 +56,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Project: anrui-parent
@@ -205,6 +206,7 @@ public class FlowableRest implements FlowableFeign {
flowList.add(a);
});
if(flowList1.size()>0){
+ flowList1 = flowList1.stream().sorted(Comparator.comparing(com.yxt.anrui.flowable.api.flowtask.FlowTask::getCreateTime)).collect(Collectors.toList());
com.yxt.anrui.flowable.api.flowtask.FlowTask appFlowableRecordVo = flowList1.get(flowList1.size()-1);
if(!"Event_end".equals(appFlowableRecordVo.getTaskDefKey())){
String proDefId = appFlowableRecordVo.getProcDefId();
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java
index e2ee36421a..1bd575c5a8 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java
@@ -46,6 +46,7 @@ public class AppService {
List voList = Optional.ofNullable(resultBean.getData().getFlowList()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppFlowableRecordVo.class)).collect(Collectors.toList());
voList.removeAll(Collections.singleton(null));
if (!voList.isEmpty()) {
+ voList = voList.stream().sorted(Comparator.comparing(AppFlowableRecordVo::getCreateTime)).collect(Collectors.toList());
for (int i = 0; i < voList.size(); i++) {
AppFlowableRecordVo vo = voList.get(i);
if (vo.getFinishTime() != null) {
@@ -150,6 +151,7 @@ public class AppService {
});
// list.sort((t1, t2) -> t2.getTime().compareTo(t1.getTime()));
if (progressList.size() > 0) {
+ progressList = progressList.stream().sorted(Comparator.comparing(AppFlowableRecordVo::getCreateTime)).collect(Collectors.toList());
AppFlowableRecordVo appFlowableRecordVo = progressList.get(progressList.size() - 1);
if (!"Event_end".equals(appFlowableRecordVo.getTaskDefKey())) {
String proDefId = appFlowableRecordVo.getProcDefId();