From dc9ba45ef010728c2ec72c9c0dda94e17af4679c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Wed, 12 Feb 2025 10:33:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=84=9A=E6=89=8B=E6=9E=B6=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/utils/PageUtil.java | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/utils/PageUtil.java b/cash-common/cash-common-tools/src/main/java/com/czg/utils/PageUtil.java
index 26a0bd31..cc423009 100644
--- a/cash-common/cash-common-tools/src/main/java/com/czg/utils/PageUtil.java
+++ b/cash-common/cash-common-tools/src/main/java/com/czg/utils/PageUtil.java
@@ -19,32 +19,27 @@ public class PageUtil {
     /**
      * 当前记录起始索引
      */
-    public static final String PAGE = "page";
+    public final String PAGE = "page";
 
     /**
      * 每页显示记录数
      */
-    public static final String SIZE = "size";
-
-    /**
-     * 排序字段，多个用逗号分隔
-     */
-    public static final String ORDER_FIELD = "orderField";
+    public final String SIZE = "size";
 
     /**
      * 排序方式，多个用逗号分隔，asc:升序,desc:降序
      */
-    public static final String ORDER = "order";
+    public final String ORDER_BY = "orderBy";
 
     /**
      * 当前记录起始索引 默认值
      */
-    public static final int DEFAULT_PAGE = 1;
+    public final int DEFAULT_PAGE = 1;
 
     /**
      * 每页显示记录数 默认值 默认查全部
      */
-    public static final int DEFAULT_SIZE = 10;
+    public final int DEFAULT_SIZE = 10;
 
     /**
      * 构造分页Page
@@ -56,7 +51,7 @@ public class PageUtil {
      *
      * @return Page<T>
      */
-    public static <T> Page<T> buildPage() {
+    public <T> Page<T> buildPage() {
         HttpServletRequest request = ServletUtil.getRequest();
         Integer pageNum = Convert.toInt(request, DEFAULT_PAGE);
         Integer pageSize = Convert.toInt(request, DEFAULT_SIZE);
@@ -78,7 +73,7 @@ public class PageUtil {
      *
      * @return QueryWrapper
      */
-    public static QueryWrapper buildPageQueryWrapper() {
+    public QueryWrapper buildPageQueryWrapper() {
         QueryWrapper queryWrapper = QueryWrapper.create();
         PageDomain pageDomain = buildPageAndSortRequest();
         if (StrUtil.isNotEmpty(pageDomain.getOrderBy())) {
@@ -92,13 +87,12 @@ public class PageUtil {
     /**
      * 封装分页对象
      */
-    private static PageDomain buildPageAndSortRequest() {
+    private PageDomain buildPageAndSortRequest() {
         PageDomain pageDomain = new PageDomain();
         HttpServletRequest request = ServletUtil.getRequest();
-        pageDomain.setPage(Convert.toInt(request.getParameter(PAGE), 1));
-        pageDomain.setSize(Convert.toInt(request.getParameter(SIZE), 10));
-        pageDomain.setOrderField(request.getParameter(ORDER_FIELD));
-        pageDomain.setOrder(request.getParameter(ORDER));
+        pageDomain.setPage(Convert.toInt(request.getParameter(PAGE), DEFAULT_PAGE));
+        pageDomain.setSize(Convert.toInt(request.getParameter(SIZE), DEFAULT_SIZE));
+        pageDomain.setOrderBy(request.getParameter(ORDER_BY));
         return pageDomain;
     }
 }