1. 修复bug

topo_dev
xueqingkun 9 months ago
parent a25d0b15b9
commit 695db87931

@ -86,6 +86,7 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
wrapper.in(CollUtil.isNotEmpty(indexIdList),ModelIndex::getId, indexIdList); wrapper.in(CollUtil.isNotEmpty(indexIdList),ModelIndex::getId, indexIdList);
} }
wrapper.orderBy(true, false, ModelIndex::getUpdateTime);
iPage = modelIndexMapper.selectPage(iPage, wrapper); iPage = modelIndexMapper.selectPage(iPage, wrapper);
// 分页查询 // 分页查询

@ -157,7 +157,8 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
Page<SystemUser> userInfoPage = super.page(Page.of(pageNum, pageSize), Page<SystemUser> userInfoPage = super.page(Page.of(pageNum, pageSize),
new LambdaQueryWrapper<SystemUser>() new LambdaQueryWrapper<SystemUser>()
.like(StrUtil.isNotEmpty(userName), SystemUser::getUserName, userName) .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())){ if (CollUtil.isEmpty(userInfoPage.getRecords())){
return Page.of(pageNum, pageSize, userInfoPage.getTotal()); return Page.of(pageNum, pageSize, userInfoPage.getTotal());

@ -27,6 +27,7 @@
<if test="index.updateEndTime != null"> <if test="index.updateEndTime != null">
and DATE_FORMAT(update_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{index.updateEndTime}, '%Y-%m-%d') and DATE_FORMAT(update_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{index.updateEndTime}, '%Y-%m-%d')
</if> </if>
order by update_time desc
</select> </select>

Loading…
Cancel
Save