diff --git a/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java b/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java index 1a00791..bddd92f 100644 --- a/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java +++ b/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.gaotao.modules.pms.service.Impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gaotao.common.utils.PageUtils; import com.gaotao.modules.base.data.BuData; @@ -49,7 +50,10 @@ public class QcBaseInfoServiceImpl implements QcBaseInfoService { **/ @Override public PageUtils qcMethodSearch(QcMethodData data) { - IPage list = this.qcBaseInfoMapper.qcMethodSearch(new Page(data.getPage(), data.getLimit()), data); + Page page = new Page<>(data.getPage(), data.getLimit()); + // SQL Server 分页必须包含 ORDER BY;自定义 SQL 无内置排序,所以这里兜底 + page.addOrder(OrderItem.desc("method_no")); + IPage list = this.qcBaseInfoMapper.qcMethodSearch(page, data); return new PageUtils(list); } @@ -127,7 +131,10 @@ public class QcBaseInfoServiceImpl implements QcBaseInfoService { **/ @Override public PageUtils qcItemSearch(QcItemData data) { - IPage list = this.qcBaseInfoMapper.qcItemSearch(new Page(data.getPage(), data.getLimit()), data); + Page page = new Page<>(data.getPage(), data.getLimit()); + // SQL Server 分页必须包含 ORDER BY;自定义 SQL 无内置排序,所以这里兜底 + page.addOrder(OrderItem.desc("ItemNo")); + IPage list = this.qcBaseInfoMapper.qcItemSearch(page, data); pmsI18nHelper.localizeQcItemList(list.getRecords(), data.getLanguageCode()); return new PageUtils(list); }