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 userInfoPage = super.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper() .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 @@ and DATE_FORMAT(update_time, '%Y-%m-%d') <= DATE_FORMAT(#{index.updateEndTime}, '%Y-%m-%d') + order by update_time desc