From d881d5cfc7bce0628dec93512186dca7e8159625 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 15 Nov 2023 15:19:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BD=93=E7=B3=BB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=89=8B=E5=8A=A8=E5=88=86=E9=A1=B5=E5=B1=82?=
 =?UTF-8?q?=E7=BA=A7=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarMenuStandardNewServiceNewImpl.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
index f875f7ea..4a6bb852 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
@@ -178,7 +178,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
     }
 
     @Override
-    public IPage<List<StandSystemDTO>> standardSystemList(StandSystemDTO standSystemDTO) {
+    public IPage<StandSystemDTO> standardSystemList(StandSystemDTO standSystemDTO) {
         String menuId = standSystemDTO.getMenuId();
         // 校验menuId不能为空
         if (StringUtils.isBlank(menuId)) {
@@ -201,9 +201,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
         // 按照标准体系排序
         // 体系内部按照国内/海外/企业排序
         // 每个类别的标准内部按照搜索中心设定的类别排序
-        // 假设 pageNum 和 pageSize 都是从1开始的
-        Integer pageNum = standSystemDTO.getPage();
-        Integer pageSize = standSystemDTO.getPageSize();
+        // 手动分页
+        int pageNum = standSystemDTO.getPage();
+        int pageSize = standSystemDTO.getPageSize();
 
         // 计算总页数
         int total = resultList.size();
@@ -217,8 +217,8 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
         List<StandSystemDTO> pageList = resultList.subList(start, end);
 
         // 使用MyBatis Plus的Page类来构造分页对象
-        Page<List<StandSystemDTO>> page = new Page<>(pageNum, pageSize, total);
-        page.setRecords(Collections.singletonList(pageList)); // 设置当前页面的记录
+        Page<StandSystemDTO> page = new Page<>(pageNum, pageSize, total);
+        page.setRecords(pageList); // 设置当前页面的记录
         page.setTotal(total); // 设置总记录数
         page.setPages(totalPages); // 设置总页数
         return page;