From 1f96732d34ed52b2dba1501237cb2b606ff82fcc Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Sun, 29 Sep 2024 13:55:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8=E9=97=AE=E9=A2=98=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=EF=BC=9B=E8=A7=A3=E5=86=B3=E4=BD=8D=E7=A7=BB=E7=9B=91=E6=B5=8B?=
 =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=E6=97=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java | 1 +
 .../com/gunshi/project/xyt/service/OsmoticShiftRService.java  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java
index c586277..3cae586 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java
@@ -70,6 +70,7 @@ public interface AssessTeamRatingMapper extends BaseMapper<AssessTeamRating> {
                 <if test="obj.status != null">
                     and t.rectify_status = #{obj.status}
                 </if>
+                order by t.rectify_status asc,t.rectify_last_date desc
             </script>
              """)
     Page<AssessRectifyVo> listPage(Page<AssessRectifyVo> page,@Param("obj") AssessTaskPageSo page1);
diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java
index c095801..2640070 100644
--- a/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java
@@ -1,6 +1,7 @@
 package com.gunshi.project.xyt.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -249,6 +250,9 @@ public class OsmoticShiftRService extends ServiceImpl<OsmoticShiftRMapper, Osmot
 
     public List<OsmoticShiftListVo> listValue() {
         List<OsmoticShiftListVo> list = baseMapper.listValue();
+        if(CollectionUtils.isEmpty(list)){
+            return list;
+        }
         OsmoticQuerySo so = new OsmoticQuerySo();
         List<String> stationCodes = list.stream().map(OsmoticShiftListVo::getStationCode).collect(Collectors.toList());
         String maxTm = list.stream().filter(o->o.getTm() != null).max(Comparator.comparing(OsmoticShiftListVo::getTm)).get().getTm();