diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java index 73641248a..9220a823b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java @@ -245,7 +245,7 @@ public class ListUtil { int resultSize = list.size(); // 每页条目数大于总数直接返回所有 if (resultSize <= pageSize) { - if (pageNo < 1) { + if (pageNo < (PageUtil.getFirstPageNo()+1)) { return Collections.unmodifiableList(list); } else { // 越界直接返回空 diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java index c8d3a0931..03374386a 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java @@ -97,5 +97,10 @@ public class ListUtilTest { Assert.assertArrayEquals(new int[]{3,4},c2); Assert.assertArrayEquals(new int[]{5},c3); Assert.assertArrayEquals(new int[]{},c4); + + + PageUtil.setFirstPageNo(1); + int[] d1 = ListUtil.page(0,8,a).stream().mapToInt(Integer::valueOf).toArray(); + Assert.assertArrayEquals(new int[]{1,2,3,4,5},d1); } }