From 59a9bf1f1a35a8a35a728ebb46650bc4c3a5c296 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Thu, 13 Jul 2017 14:29:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/utils/CollectionUtils.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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); } } -- 1.8.3.1