From 6f1e398c107c864453b8936d4e6f9df0d6daef1b Mon Sep 17 00:00:00 2001 From: lilong Date: Tue, 2 Apr 2024 15:18:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9pageNumber=E4=B8=BApa?= =?UTF-8?q?ge=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=89=8D=E7=AB=AF=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=98=AF=E8=BF=99=E6=A0=B7=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/axzo/pokonyan/dao/converter/PageConverter.java | 2 +- src/main/java/cn/axzo/pokonyan/dao/page/IPageParam.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/axzo/pokonyan/dao/converter/PageConverter.java b/src/main/java/cn/axzo/pokonyan/dao/converter/PageConverter.java index 72dd9c4..1aa85b6 100644 --- a/src/main/java/cn/axzo/pokonyan/dao/converter/PageConverter.java +++ b/src/main/java/cn/axzo/pokonyan/dao/converter/PageConverter.java @@ -33,7 +33,7 @@ public class PageConverter { */ public static Page convertToMybatis(IPageParam page, Class entityClz) { int pageSize = Math.min(Optional.ofNullable(page.getPageSize()).orElse(IPageParam.DEFAULT_PAGE_SIZE), IPageParam.MAX_PAGE_SIZE); - Integer current = Optional.ofNullable(page.getPageNumber()).orElse(IPageParam.DEFAULT_PAGE_NUMBER); + Integer current = Optional.ofNullable(page.getPage()).orElse(IPageParam.DEFAULT_PAGE_NUMBER); Page myBatisPage = new Page<>(current, pageSize); diff --git a/src/main/java/cn/axzo/pokonyan/dao/page/IPageParam.java b/src/main/java/cn/axzo/pokonyan/dao/page/IPageParam.java index eab36eb..f410f9c 100644 --- a/src/main/java/cn/axzo/pokonyan/dao/page/IPageParam.java +++ b/src/main/java/cn/axzo/pokonyan/dao/page/IPageParam.java @@ -15,7 +15,7 @@ public interface IPageParam { String SORT_DESC = OrderEnum.DESC.name(); String SORT_ASC = OrderEnum.ASC.name(); - default Integer getPageNumber() { + default Integer getPage() { return DEFAULT_PAGE_NUMBER; }