From cdb79bcb39f06efa88eb581bab30cf0a5439cfa8 Mon Sep 17 00:00:00 2001 From: leoxxx Date: Sat, 21 May 2022 18:00:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=94=B9=E5=8F=98=E7=94=A8=E6=88=B7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E4=B8=BA=E7=94=A8=E6=88=B7id=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/system/dal/mysql/user/AdminUserMapper.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java index be4b5ea21..b7d5e3daa 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java +++ b/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; import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserExportReqVO; import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO; +import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; @@ -33,7 +34,9 @@ public interface AdminUserMapper extends BaseMapperX { .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile()) .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus()) .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime()) - .inIfPresent(AdminUserDO::getDeptId, deptIds)); + .inIfPresent(AdminUserDO::getDeptId, deptIds) + .orderByDesc(AdminUserDO::getId)); + } default List selectList(UserExportReqVO reqVO, Collection deptIds) { From f72597c434262c28ff524d07b1d547818e4198d4 Mon Sep 17 00:00:00 2001 From: leoxxx Date: Sat, 21 May 2022 19:23:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86=E3=80=81=E8=81=8C?= =?UTF-8?q?=E4=BD=8D=E7=AE=A1=E7=90=86=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E5=88=97=E8=A1=A8=E6=94=B9=E6=88=90?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=8C=89id=E5=80=92=E5=BA=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E3=80=82=E9=94=99=E8=AF=AF=E7=A0=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=88=9D=E5=A7=8B=E6=8C=89code=E5=80=92?= =?UTF-8?q?=E5=BA=8F=E6=98=BE=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iocoder/yudao/module/system/dal/mysql/dept/PostMapper.java | 3 ++- .../yudao/module/system/dal/mysql/dict/DictDataMapper.java | 2 +- .../module/system/dal/mysql/errorcode/ErrorCodeMapper.java | 2 +- .../yudao/module/system/dal/mysql/notice/NoticeMapper.java | 3 ++- .../yudao/module/system/dal/mysql/permission/RoleMapper.java | 3 ++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/PostMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/PostMapper.java index ecbd75949..6bcb8e2fd 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/PostMapper.java +++ b/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 { return selectPage(reqVO, new QueryWrapperX() .likeIfPresent("code", reqVO.getCode()) .likeIfPresent("name", reqVO.getName()) - .eqIfPresent("status", reqVO.getStatus())); + .eqIfPresent("status", reqVO.getStatus()) + .orderByDesc("id")); } default List selectList(PostExportReqVO reqVO) { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java index eadc6884f..845f21db9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java +++ b/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 { .likeIfPresent(DictDataDO::getLabel, reqVO.getLabel()) .likeIfPresent(DictDataDO::getDictType, reqVO.getDictType()) .eqIfPresent(DictDataDO::getStatus, reqVO.getStatus()) - .orderByAsc(Arrays.asList(DictDataDO::getDictType, DictDataDO::getSort))); + .orderByDesc(Arrays.asList(DictDataDO::getDictType, DictDataDO::getSort))); } default List selectList(DictDataExportReqVO reqVO) { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/errorcode/ErrorCodeMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/errorcode/ErrorCodeMapper.java index ab514bd22..84842497c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/errorcode/ErrorCodeMapper.java +++ b/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 { .eqIfPresent("code", reqVO.getCode()) .likeIfPresent("message", reqVO.getMessage()) .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime()) - .orderByAsc("application_name", "code")); + .orderByDesc("code")); } default List selectList(ErrorCodeExportReqVO reqVO) { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notice/NoticeMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notice/NoticeMapper.java index 15811613a..67ff8db09 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notice/NoticeMapper.java +++ b/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 { default PageResult selectPage(NoticePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(NoticeDO::getTitle, reqVO.getTitle()) - .eqIfPresent(NoticeDO::getStatus, reqVO.getStatus())); + .eqIfPresent(NoticeDO::getStatus, reqVO.getStatus()) + .orderByDesc(NoticeDO::getId)); } } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java index a23b9504c..359c7290b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java +++ b/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 { .likeIfPresent(RoleDO::getName, reqVO.getName()) .likeIfPresent(RoleDO::getCode, reqVO.getCode()) .eqIfPresent(RoleDO::getStatus, reqVO.getStatus()) - .betweenIfPresent(BaseDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime())); + .betweenIfPresent(BaseDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime()) + .orderByDesc(RoleDO::getId)); } default List selectList(RoleExportReqVO reqVO) { From 7e09b406abcea747ba47130a5ba04b4beba4a4cd Mon Sep 17 00:00:00 2001 From: leoxxx Date: Sat, 21 May 2022 20:53:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86=E3=80=81=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=E7=AE=A1=E7=90=86=E3=80=81=E8=A7=92=E8=89=B2=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=95=8C=E9=9D=A2=E7=9A=84=E5=88=97=E8=A1=A8=E6=94=B9?= =?UTF-8?q?=E6=88=90=E5=88=9D=E5=A7=8B=E6=8C=89id=E5=80=92=E5=BA=8F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E3=80=82=E9=94=99=E8=AF=AF=E7=A0=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=94=B9=E4=B8=BA=E5=88=9D=E5=A7=8B=E6=8C=89code?= =?UTF-8?q?=E5=80=92=E5=BA=8F=E6=98=BE=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/system/dal/mysql/dict/DictTypeMapper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictTypeMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictTypeMapper.java index 75297992d..85c2acee4 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictTypeMapper.java +++ b/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; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeExportReqVO; import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypePageReqVO; +import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; import org.apache.ibatis.annotations.Mapper; @@ -18,7 +19,8 @@ public interface DictTypeMapper extends BaseMapperX { .likeIfPresent(DictTypeDO::getName, reqVO.getName()) .likeIfPresent(DictTypeDO::getType, reqVO.getType()) .eqIfPresent(DictTypeDO::getStatus, reqVO.getStatus()) - .betweenIfPresent(DictTypeDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())); + .betweenIfPresent(DictTypeDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime()) + .orderByDesc(DictTypeDO::getId)); } default List selectList(DictTypeExportReqVO reqVO) {