fix：【全局】sqlserver 在分页的兼容性

YunaiV
1 parent 387c5cd6
Showing 5 changed files with 8 additions and 12 deletions
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/codegen/CodegenTableMapper.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/config/ConfigMapper.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/job/JobMapper.java
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
@@ -23,8 +23,7 @@ public interface CodegenTableMapper extends BaseMapperX&lt;CodegenTableDO&gt; {
                 .likeIfPresent(CodegenTableDO::getTableComment, pageReqVO.getTableComment())
                 .likeIfPresent(CodegenTableDO::getClassName, pageReqVO.getClassName())
                 .betweenIfPresent(CodegenTableDO::getCreateTime, pageReqVO.getCreateTime())
-                .orderByDesc(CodegenTableDO::getUpdateTime)
-        );
+                .orderByDesc(CodegenTableDO::getUpdateTime));
     }
     default List<CodegenTableDO> selectListByDataSourceConfigId(Long dataSourceConfigId) {
@@ -19,7 +19,8 @@ public interface ConfigMapper extends BaseMapperX&lt;ConfigDO&gt; {
                 .likeIfPresent(ConfigDO::getName, reqVO.getName())
                 .likeIfPresent(ConfigDO::getConfigKey, reqVO.getKey())
                 .eqIfPresent(ConfigDO::getType, reqVO.getType())
-                .betweenIfPresent(ConfigDO::getCreateTime, reqVO.getCreateTime()));
+                .betweenIfPresent(ConfigDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(ConfigDO::getId));
     }
 }
@@ -24,7 +24,7 @@ public interface JobMapper extends BaseMapperX&lt;JobDO&gt; {
                 .likeIfPresent(JobDO::getName, reqVO.getName())
                 .eqIfPresent(JobDO::getStatus, reqVO.getStatus())
                 .likeIfPresent(JobDO::getHandlerName, reqVO.getHandlerName())
-        );
+                .orderByDesc(JobDO::getId));
     }
 }
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.system.dal.mysql.mail;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -14,7 +13,8 @@ public interface MailAccountMapper extends BaseMapperX&lt;MailAccountDO&gt; {
     default PageResult<MailAccountDO> selectPage(MailAccountPageReqVO pageReqVO) {
         return selectPage(pageReqVO, new LambdaQueryWrapperX<MailAccountDO>()
                 .likeIfPresent(MailAccountDO::getMail, pageReqVO.getMail())
-                .likeIfPresent(MailAccountDO::getUsername , pageReqVO.getUsername()));
+                .likeIfPresent(MailAccountDO::getUsername , pageReqVO.getUsername())
+                .orderByDesc(MailAccountDO::getId));
     }
 }
@@ -3,14 +3,9 @@ package cn.iocoder.yudao.module.system.dal.mysql.mail;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.Date;
 @Mapper
 public interface MailTemplateMapper extends BaseMapperX<MailTemplateDO> {
@@ -21,7 +16,8 @@ public interface MailTemplateMapper extends BaseMapperX&lt;MailTemplateDO&gt; {
                 .likeIfPresent(MailTemplateDO::getCode, pageReqVO.getCode())
                 .likeIfPresent(MailTemplateDO::getName, pageReqVO.getName())
                 .eqIfPresent(MailTemplateDO::getAccountId, pageReqVO.getAccountId())
-                .betweenIfPresent(MailTemplateDO::getCreateTime, pageReqVO.getCreateTime()));
+                .betweenIfPresent(MailTemplateDO::getCreateTime, pageReqVO.getCreateTime())
+                .orderByDesc(MailTemplateDO::getId));
     }
     default Long selectCountByAccountId(Long accountId) {