From 5208e5b02d2eed0d8935345bd1fa5a021f4fbbd0 Mon Sep 17 00:00:00 2001 From: "haochen.li" Date: Wed, 21 Oct 2020 22:42:43 +0800 Subject: [PATCH] =?UTF-8?q?ListUtil=E7=9A=84page=E6=96=B9=E6=B3=95=20?= =?UTF-8?q?=E8=B0=83=E7=94=A8PageUtil.setFirstPageNo(),=E5=A6=82=E6=9E=9Cf?= =?UTF-8?q?irstPageNo=E4=B8=8D=E6=98=AF=E4=BB=8E0=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E4=BC=9A=E5=8F=91=E7=94=9F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/hutool/core/collection/ListUtil.java | 2 +- .../test/java/cn/hutool/core/collection/ListUtilTest.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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); } }