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 68aa8fe9..7d7f42cc 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 @@ -56,7 +56,7 @@ public interface CasesRecordDao extends JpaRepository, JpaSpecifi " 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' and :#{#condition.orderField}!='sysCreateTime' , c.sys_create_time , null) desc", + " IF(:#{#condition.orderField}='views' or :#{#condition.orderField}!='sysCreateTime' , c.sys_create_time , null) desc", countQuery = " SELECT count(*) FROM ( " + " SELECT b.* " + @@ -92,7 +92,7 @@ public interface CasesRecordDao extends JpaRepository, JpaSpecifi " 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' and :#{#condition.orderField}!='sysCreateTime' , c.sys_create_time , null) desc" + " IF(:#{#condition.orderField}!='views' or :#{#condition.orderField}!='sysCreateTime' , c.sys_create_time , null) desc" ) Page 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 8ba8d26a..a1b4f706 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 @@ -310,7 +310,7 @@ public class CasesServiceImpl implements ICasesService { filters.add(FieldFilters.eq("excellent", caseVo.getExcellent())); } OrderCondition order = null; - if (StringUtils.isNotBlank(caseVo.getOrderField()) && caseVo.getOrderAsc() != null) { + if (StringUtils.isNotBlank(caseVo.getOrderField()) && caseVo.getOrderAsc() != null && ("sysCreateTime".equals(caseVo.getOrderField()) || "views".equals(caseVo.getOrderField()))) { if (caseVo.getOrderAsc()) { order = OrderCondition.asc(caseVo.getOrderField()); } else {