Commit 138290326eba55f8d32d60f17fe6fa83fb536e4d

Authored by 芋道源码
Committed by Gitee
2 parents c09b0708 7e09b406

!174 字典管理、通知管理、岗位管理、角色管理界面的列表改成初始按id倒序显示。错误码管理改为初始按code倒序显示。

Merge pull request !174 from 枫叶/master
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/PostMapper.java
@@ -24,7 +24,8 @@ public interface PostMapper extends BaseMapperX<PostDO> { @@ -24,7 +24,8 @@ public interface PostMapper extends BaseMapperX<PostDO> {
24 return selectPage(reqVO, new QueryWrapperX<PostDO>() 24 return selectPage(reqVO, new QueryWrapperX<PostDO>()
25 .likeIfPresent("code", reqVO.getCode()) 25 .likeIfPresent("code", reqVO.getCode())
26 .likeIfPresent("name", reqVO.getName()) 26 .likeIfPresent("name", reqVO.getName())
27 - .eqIfPresent("status", reqVO.getStatus())); 27 + .eqIfPresent("status", reqVO.getStatus())
  28 + .orderByDesc("id"));
28 } 29 }
29 30
30 default List<PostDO> selectList(PostExportReqVO reqVO) { 31 default List<PostDO> selectList(PostExportReqVO reqVO) {
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java
@@ -37,7 +37,7 @@ public interface DictDataMapper extends BaseMapperX&lt;DictDataDO&gt; { @@ -37,7 +37,7 @@ public interface DictDataMapper extends BaseMapperX&lt;DictDataDO&gt; {
37 .likeIfPresent(DictDataDO::getLabel, reqVO.getLabel()) 37 .likeIfPresent(DictDataDO::getLabel, reqVO.getLabel())
38 .likeIfPresent(DictDataDO::getDictType, reqVO.getDictType()) 38 .likeIfPresent(DictDataDO::getDictType, reqVO.getDictType())
39 .eqIfPresent(DictDataDO::getStatus, reqVO.getStatus()) 39 .eqIfPresent(DictDataDO::getStatus, reqVO.getStatus())
40 - .orderByAsc(Arrays.asList(DictDataDO::getDictType, DictDataDO::getSort))); 40 + .orderByDesc(Arrays.asList(DictDataDO::getDictType, DictDataDO::getSort)));
41 } 41 }
42 42
43 default List<DictDataDO> selectList(DictDataExportReqVO reqVO) { 43 default List<DictDataDO> selectList(DictDataExportReqVO reqVO) {
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictTypeMapper.java
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; @@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; 5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
6 import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeExportReqVO; 6 import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeExportReqVO;
7 import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypePageReqVO; 7 import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypePageReqVO;
  8 +import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
8 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; 9 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO;
9 import org.apache.ibatis.annotations.Mapper; 10 import org.apache.ibatis.annotations.Mapper;
10 11
@@ -18,7 +19,8 @@ public interface DictTypeMapper extends BaseMapperX&lt;DictTypeDO&gt; { @@ -18,7 +19,8 @@ public interface DictTypeMapper extends BaseMapperX&lt;DictTypeDO&gt; {
18 .likeIfPresent(DictTypeDO::getName, reqVO.getName()) 19 .likeIfPresent(DictTypeDO::getName, reqVO.getName())
19 .likeIfPresent(DictTypeDO::getType, reqVO.getType()) 20 .likeIfPresent(DictTypeDO::getType, reqVO.getType())
20 .eqIfPresent(DictTypeDO::getStatus, reqVO.getStatus()) 21 .eqIfPresent(DictTypeDO::getStatus, reqVO.getStatus())
21 - .betweenIfPresent(DictTypeDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())); 22 + .betweenIfPresent(DictTypeDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  23 + .orderByDesc(DictTypeDO::getId));
22 } 24 }
23 25
24 default List<DictTypeDO> selectList(DictTypeExportReqVO reqVO) { 26 default List<DictTypeDO> selectList(DictTypeExportReqVO reqVO) {
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/errorcode/ErrorCodeMapper.java
@@ -23,7 +23,7 @@ public interface ErrorCodeMapper extends BaseMapperX&lt;ErrorCodeDO&gt; { @@ -23,7 +23,7 @@ public interface ErrorCodeMapper extends BaseMapperX&lt;ErrorCodeDO&gt; {
23 .eqIfPresent("code", reqVO.getCode()) 23 .eqIfPresent("code", reqVO.getCode())
24 .likeIfPresent("message", reqVO.getMessage()) 24 .likeIfPresent("message", reqVO.getMessage())
25 .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime()) 25 .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
26 - .orderByAsc("application_name", "code")); 26 + .orderByDesc("code"));
27 } 27 }
28 28
29 default List<ErrorCodeDO> selectList(ErrorCodeExportReqVO reqVO) { 29 default List<ErrorCodeDO> selectList(ErrorCodeExportReqVO reqVO) {
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notice/NoticeMapper.java
@@ -13,7 +13,8 @@ public interface NoticeMapper extends BaseMapperX&lt;NoticeDO&gt; { @@ -13,7 +13,8 @@ public interface NoticeMapper extends BaseMapperX&lt;NoticeDO&gt; {
13 default PageResult<NoticeDO> selectPage(NoticePageReqVO reqVO) { 13 default PageResult<NoticeDO> selectPage(NoticePageReqVO reqVO) {
14 return selectPage(reqVO, new LambdaQueryWrapperX<NoticeDO>() 14 return selectPage(reqVO, new LambdaQueryWrapperX<NoticeDO>()
15 .likeIfPresent(NoticeDO::getTitle, reqVO.getTitle()) 15 .likeIfPresent(NoticeDO::getTitle, reqVO.getTitle())
16 - .eqIfPresent(NoticeDO::getStatus, reqVO.getStatus())); 16 + .eqIfPresent(NoticeDO::getStatus, reqVO.getStatus())
  17 + .orderByDesc(NoticeDO::getId));
17 } 18 }
18 19
19 } 20 }
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java
@@ -23,7 +23,8 @@ public interface RoleMapper extends BaseMapperX&lt;RoleDO&gt; { @@ -23,7 +23,8 @@ public interface RoleMapper extends BaseMapperX&lt;RoleDO&gt; {
23 .likeIfPresent(RoleDO::getName, reqVO.getName()) 23 .likeIfPresent(RoleDO::getName, reqVO.getName())
24 .likeIfPresent(RoleDO::getCode, reqVO.getCode()) 24 .likeIfPresent(RoleDO::getCode, reqVO.getCode())
25 .eqIfPresent(RoleDO::getStatus, reqVO.getStatus()) 25 .eqIfPresent(RoleDO::getStatus, reqVO.getStatus())
26 - .betweenIfPresent(BaseDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime())); 26 + .betweenIfPresent(BaseDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime())
  27 + .orderByDesc(RoleDO::getId));
27 } 28 }
28 29
29 default List<RoleDO> selectList(RoleExportReqVO reqVO) { 30 default List<RoleDO> selectList(RoleExportReqVO reqVO) {
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.dal.mysql.user; @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.dal.mysql.user;
2 2
3 import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserExportReqVO; 3 import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserExportReqVO;
4 import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO; 4 import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO;
  5 +import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO;
5 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; 6 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 7 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 8 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
@@ -33,7 +34,9 @@ public interface AdminUserMapper extends BaseMapperX&lt;AdminUserDO&gt; { @@ -33,7 +34,9 @@ public interface AdminUserMapper extends BaseMapperX&lt;AdminUserDO&gt; {
33 .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile()) 34 .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
34 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus()) 35 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
35 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime()) 36 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime())
36 - .inIfPresent(AdminUserDO::getDeptId, deptIds)); 37 + .inIfPresent(AdminUserDO::getDeptId, deptIds)
  38 + .orderByDesc(AdminUserDO::getId));
  39 +
37 } 40 }
38 41
39 default List<AdminUserDO> selectList(UserExportReqVO reqVO, Collection<Long> deptIds) { 42 default List<AdminUserDO> selectList(UserExportReqVO reqVO, Collection<Long> deptIds) {