From dc407a82cca016db6896104804eef9b660d9d5a1 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Fri, 6 Dec 2024 21:53:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(extension/crud):=20=E4=BF=AE=E5=A4=8D=20Pag?=
 =?UTF-8?q?eResp=20=E6=89=8B=E5=8A=A8=E5=88=86=E9=A1=B5=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #7
---
 .../starter/extension/crud/model/resp/PageResp.java         | 6 ++----
 .../starter/extension/crud/model/resp/PageResp.java         | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/model/resp/PageResp.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/model/resp/PageResp.java
index 552057c4..d70192d7 100644
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/model/resp/PageResp.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/model/resp/PageResp.java
@@ -93,12 +93,10 @@ public class PageResp<L> extends BasePageResp<L> {
         pageResp.setTotal(list.size());
         // 对列表数据进行分页
         int fromIndex = (page - 1) * size;
-        int toIndex = page * size + fromIndex;
-        if (fromIndex > list.size()) {
+        if (fromIndex >= list.size()) {
             pageResp.setList(new ArrayList<>(0));
-        } else if (toIndex >= list.size()) {
-            pageResp.setList(list.subList(fromIndex, list.size()));
         } else {
+            int toIndex = Math.min(fromIndex + size, list.size());
             pageResp.setList(list.subList(fromIndex, toIndex));
         }
         return pageResp;
diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/model/resp/PageResp.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/model/resp/PageResp.java
index 8483bf7b..04c352cd 100644
--- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/model/resp/PageResp.java
+++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/model/resp/PageResp.java
@@ -93,12 +93,10 @@ public class PageResp<L> extends BasePageResp<L> {
         pageResp.setTotal(list.size());
         // 对列表数据进行分页
         int fromIndex = (page - 1) * size;
-        int toIndex = page * size + fromIndex;
-        if (fromIndex > list.size()) {
+        if (fromIndex >= list.size()) {
             pageResp.setList(new ArrayList<>(0));
-        } else if (toIndex >= list.size()) {
-            pageResp.setList(list.subList(fromIndex, list.size()));
         } else {
+            int toIndex = Math.min(fromIndex + size, list.size());
             pageResp.setList(list.subList(fromIndex, toIndex));
         }
         return pageResp;