From 695db87931109868367e65a58bd5473b0302a842 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Thu, 15 Aug 2024 14:07:00 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/police/service/impl/ModelIndexServiceImpl.java | 1 +
 .../supervision/police/service/impl/SystemUserServiceImpl.java | 3 ++-
 src/main/resources/mapper/ModelAtomicIndexMapper.xml           | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java
index 4909cf0..43ee7b1 100644
--- a/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java
@@ -86,6 +86,7 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
             wrapper.in(CollUtil.isNotEmpty(indexIdList),ModelIndex::getId, indexIdList);
         }
 
+        wrapper.orderBy(true, false, ModelIndex::getUpdateTime);
         iPage = modelIndexMapper.selectPage(iPage, wrapper);
 
         // 分页查询
diff --git a/src/main/java/com/supervision/police/service/impl/SystemUserServiceImpl.java b/src/main/java/com/supervision/police/service/impl/SystemUserServiceImpl.java
index c04071a..80f949b 100644
--- a/src/main/java/com/supervision/police/service/impl/SystemUserServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/SystemUserServiceImpl.java
@@ -157,7 +157,8 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         Page<SystemUser> userInfoPage = super.page(Page.of(pageNum, pageSize),
                 new LambdaQueryWrapper<SystemUser>()
                         .like(StrUtil.isNotEmpty(userName), SystemUser::getUserName, userName)
-                        .in(CollUtil.isNotEmpty(userRoleFilterList), SystemUser::getId, userRoleFilterList.stream().map(UserRoleDTO::getUserId).toList()));
+                        .in(CollUtil.isNotEmpty(userRoleFilterList), SystemUser::getId, userRoleFilterList.stream().map(UserRoleDTO::getUserId).toList())
+                        .orderBy(true,false, SystemUser::getUpdateTime));
 
         if (CollUtil.isEmpty(userInfoPage.getRecords())){
             return Page.of(pageNum, pageSize, userInfoPage.getTotal());
diff --git a/src/main/resources/mapper/ModelAtomicIndexMapper.xml b/src/main/resources/mapper/ModelAtomicIndexMapper.xml
index baccf25..401bdfe 100644
--- a/src/main/resources/mapper/ModelAtomicIndexMapper.xml
+++ b/src/main/resources/mapper/ModelAtomicIndexMapper.xml
@@ -27,6 +27,7 @@
         <if test="index.updateEndTime != null">
             and DATE_FORMAT(update_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{index.updateEndTime}, '%Y-%m-%d')
         </if>
+        order by update_time desc
     </select>