From 4f2a32e733d0a73ff719c07713c36e8730983991 Mon Sep 17 00:00:00 2001
From: wsy <28511238@qq.com>
Date: Fri, 25 Sep 2020 09:43:58 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=8C=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E4=BC=A0=E7=A9=BA=E6=97=B6=E6=9F=A5=E8=AF=A2=E5=85=A8?=
 =?UTF-8?q?=E8=A1=A8"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 99e7820bc74818d8f0b97d865db3f65761e7424a.
---
 .../main/java/com/ruoyi/common/constant/Constants.java | 10 ----------
 .../ruoyi/common/core/controller/BaseController.java   |  7 +++++--
 .../java/com/ruoyi/common/core/page/TableSupport.java  |  4 ++--
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
index 0433be867..109511b18 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -51,21 +51,11 @@ public class Constants
      * 当前记录起始索引
      */
     public static final String PAGE_NUM = "pageNum";
-    
-    /**
-     * 当前记录起始索引默认值
-     */
-    public static final int PAGE_NUM_DEFAULT_VALUE = 1;
 
     /**
      * 每页显示记录数
      */
     public static final String PAGE_SIZE = "pageSize";
-    
-    /**
-     * 每页显示记录数默认值
-     */
-    public static final int PAGE_SIZE_DEFAULT_VALUE = 10;
 
     /**
      * 排序列
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index 627405e0a..f21285364 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -56,8 +56,11 @@ public class BaseController
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
-        String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
-        PageHelper.startPage(pageNum, pageSize, orderBy);
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
+        {
+            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+            PageHelper.startPage(pageNum, pageSize, orderBy);
+        }
     }
 
     /**
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
index 4589439f6..0efd82b32 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
@@ -16,8 +16,8 @@ public class TableSupport
     public static PageDomain getPageDomain()
     {
         PageDomain pageDomain = new PageDomain();
-        pageDomain.setPageNum(ServletUtils.getParameterToInt(Constants.PAGE_NUM, Constants.PAGE_NUM_DEFAULT_VALUE));
-        pageDomain.setPageSize(ServletUtils.getParameterToInt(Constants.PAGE_SIZE, Constants.PAGE_SIZE_DEFAULT_VALUE));
+        pageDomain.setPageNum(ServletUtils.getParameterToInt(Constants.PAGE_NUM));
+        pageDomain.setPageSize(ServletUtils.getParameterToInt(Constants.PAGE_SIZE));
         pageDomain.setOrderByColumn(ServletUtils.getParameter(Constants.ORDER_BY_COLUMN));
         pageDomain.setIsAsc(ServletUtils.getParameter(Constants.IS_ASC));
         return pageDomain;