From 1fbf56dec399f169c45c1288a06b2770bc8c631e Mon Sep 17 00:00:00 2001
From: yang <1175@qq.com>
Date: Tue, 10 Sep 2024 14:02:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E8=90=83=E5=8F=96=EF=BC=8Cbu?=
 =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xboe/module/boecase/dao/CasesRecordDao.java    | 6 ++----
 .../xboe/module/boecase/service/impl/CasesServiceImpl.java  | 5 +++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java
index 7d7f42cc..cc2f22eb 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java
@@ -55,8 +55,7 @@ public interface CasesRecordDao extends JpaRepository<Cases, String>, JpaSpecifi
                     "   IF(:#{#condition.orderField}='views' and :#{#condition.orderAsc}=true,c.views, null) asc," +
                     "   IF(:#{#condition.orderField}='views' and :#{#condition.orderAsc}=false,c.views, null) desc," +
                     "   IF(:#{#condition.orderField}='sysCreateTime' and :#{#condition.orderAsc}=true ,c.sys_create_time,null) asc," +
-                    "   IF(:#{#condition.orderField}='sysCreateTime' and :#{#condition.orderAsc}=false , c.sys_create_time,null) desc ," +
-                    "   IF(:#{#condition.orderField}='views' or  :#{#condition.orderField}!='sysCreateTime' , c.sys_create_time , null) desc",
+                    "   IF(:#{#condition.orderField}='sysCreateTime' and :#{#condition.orderAsc}=false , c.sys_create_time,null) desc",
             countQuery =
                     " SELECT count(*) FROM ( " +
                             "   SELECT b.* " +
@@ -91,8 +90,7 @@ public interface CasesRecordDao extends JpaRepository<Cases, String>, JpaSpecifi
                             "   IF(:#{#condition.orderField}='views' and :#{#condition.orderAsc}=true,c.views, null) asc," +
                             "   IF(:#{#condition.orderField}='views' and :#{#condition.orderAsc}=false,c.views, null) desc," +
                             "   IF(:#{#condition.orderField}='sysCreateTime' and :#{#condition.orderAsc}=true ,c.sys_create_time,null) asc," +
-                            "   IF(:#{#condition.orderField}='sysCreateTime' and :#{#condition.orderAsc}=false , c.sys_create_time,null) desc," +
-                            "   IF(:#{#condition.orderField}!='views' or  :#{#condition.orderField}!='sysCreateTime' , c.sys_create_time , null) desc"
+                            "   IF(:#{#condition.orderField}='sysCreateTime' and :#{#condition.orderAsc}=false , c.sys_create_time,null) desc"
     )
     Page<Cases> queryList(Pageable pageable, @Param("condition") CasePageVo casePage);
 
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
index a1b4f706..cbabd5c6 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
@@ -385,6 +385,11 @@ public class CasesServiceImpl implements ICasesService {
         caseVo.setOrg2(level2);
         caseVo.setOrg3(level3);
 
+        if (StringUtils.isBlank(caseVo.getOrderField()) || caseVo.getOrderAsc()==null || (!"sysCreateTime".equals(caseVo.getOrderField()) && !"views".equals(caseVo.getOrderField()))){
+            caseVo.setOrderField("sysCreateTime");
+            caseVo.setOrderAsc(false);
+        }
+
         Page<Cases> cases = casesRecordDao.queryList(pageRequest,caseVo);
         PageList<Cases> pageList = new PageList<>();
         pageList.setCount((int) cases.getTotalElements());