查询修改

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<QcMethodData> list = this.qcBaseInfoMapper.qcMethodSearch(new Page<QcMethodData>(data.getPage(), data.getLimit()), data);
+        Page<QcMethodData> page = new Page<>(data.getPage(), data.getLimit());
+        // SQL Server 分页必须包含 ORDER BY；自定义 SQL 无内置排序，所以这里兜底
+        page.addOrder(OrderItem.desc("method_no"));
+        IPage<QcMethodData> 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<QcItemData> list = this.qcBaseInfoMapper.qcItemSearch(new Page<QcItemData>(data.getPage(), data.getLimit()), data);
+        Page<QcItemData> page = new Page<>(data.getPage(), data.getLimit());
+        // SQL Server 分页必须包含 ORDER BY；自定义 SQL 无内置排序，所以这里兜底
+        page.addOrder(OrderItem.desc("ItemNo"));
+        IPage<QcItemData> list = this.qcBaseInfoMapper.qcItemSearch(page, data);
         pmsI18nHelper.localizeQcItemList(list.getRecords(), data.getLanguageCode());
         return new PageUtils(list);
     }