From 6c0fe2170c6c58d101826e78f3bb2973f1eeede9 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 12 Jun 2024 11:25:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/service/xgf/impl/XgfUserServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 6cbb7a6a..0c3707ab 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -19,11 +19,9 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.math.BigDecimal; import java.net.PasswordAuthentication; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Service @@ -383,7 +381,9 @@ public class XgfUserServiceImpl implements XgfUserService { for (PageData x : list) { condition.clear(); condition.put("FLOW_ID", x.getString("FLOW_ID")); - x.put("flow", flowDetailMapper.getList(condition)); + List flow = flowDetailMapper.getList(condition); + flow = flow.stream().sorted(Comparator.comparing(o -> new BigDecimal(String.valueOf(o.get("SORT"))))).collect(Collectors.toList()); + x.put("flow",flow); } return list; }