diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java index aa97ae4..25a5af5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java @@ -162,10 +162,13 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt public static List getPageIds(List data, Integer page, Integer limit) { Integer startIndex = (page - 1) * limit; Integer endIndex = startIndex + limit; - if(data.size() > endIndex) { - return data.subList(startIndex, endIndex); + if(startIndex >= data.size()) { + return new ArrayList<>(); } - return data.subList(startIndex, data.size()); + if(endIndex > data.size() - 1) { + return data.subList(startIndex, data.size() - 1); + } + return data.subList(startIndex, endIndex); } }