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 extends BasePageResp { 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 extends BasePageResp { 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;