zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2026-05-29 18:57:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复Page和PageResult首页调用问题（issue#IH7A18@Gitee）

Browse Source
This commit is contained in:
Looly
2026-03-20 12:13:19 +08:00
parent d5dac7cd51
commit 0d586c4a0f
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -1,11 +1,12 @@
# 🚀Changelog
-------------------------------------------------------------------------------------------------------------
# 5.8.45(2026-03-19)
# 5.8.45(2026-03-20)
### 🐣新特性
* 【core 】 `AnnotationUtil`新增两级缓存架构，提升高频注解解析性能（pr#1434@Gitee）
### 🐞Bug修复
* 【db 】 修复`Page`和`PageResult`首页调用问题（issue#IH7A18@Gitee）
-------------------------------------------------------------------------------------------------------------
# 5.8.44(2026-03-11)

6
hutool-db/src/main/java/cn/hutool/db/Page.java
View File

@@ -51,7 +51,7 @@ public class Page implements Segment<Integer>, Serializable {
* @since 4.5.16
*/
public Page() {
this(0, DEFAULT_PAGE_SIZE);
this(PageUtil.getFirstPageNo(), DEFAULT_PAGE_SIZE);
}
/**
@@ -61,7 +61,7 @@ public class Page implements Segment<Integer>, Serializable {
* @param pageSize 每页结果数
*/
public Page(int pageNumber, int pageSize) {
this.pageNumber = Math.max(pageNumber, 0);
this.pageNumber = Math.max(pageNumber, PageUtil.getFirstPageNo());
this.pageSize = pageSize <= 0 ? DEFAULT_PAGE_SIZE : pageSize;
}
@@ -93,7 +93,7 @@ public class Page implements Segment<Integer>, Serializable {
* @param pageNumber 页码
*/
public void setPageNumber(int pageNumber) {
this.pageNumber = Math.max(pageNumber, 0);
this.pageNumber = Math.max(pageNumber, PageUtil.getFirstPageNo());
}
/**

8
hutool-db/src/main/java/cn/hutool/db/PageResult.java
View File

@@ -38,7 +38,7 @@ public class PageResult<T> extends ArrayList<T> {
* 构造
*/
public PageResult() {
this(0, DEFAULT_PAGE_SIZE);
this(PageUtil.getFirstPageNo(), DEFAULT_PAGE_SIZE);
}
/**
@@ -50,7 +50,7 @@ public class PageResult<T> extends ArrayList<T> {
public PageResult(int page, int pageSize) {
super(pageSize <= 0 ? DEFAULT_PAGE_SIZE : pageSize);
this.page = Math.max(page, 0);
this.page = Math.max(page, PageUtil.getFirstPageNo());
this.pageSize = pageSize <= 0 ? DEFAULT_PAGE_SIZE : pageSize;
}
@@ -86,7 +86,7 @@ public class PageResult<T> extends ArrayList<T> {
* @param page 页码
*/
public void setPage(int page) {
this.page = page;
this.page = Math.max(page, PageUtil.getFirstPageNo());
}
/**
@@ -149,6 +149,6 @@ public class PageResult<T> extends ArrayList<T> {
* @return 是否最后一页
*/
public boolean isLast() {
return this.page >= (this.totalPage - 1);
return this.page - PageUtil.getFirstPageNo() >= (this.totalPage - 1);
}
}