From 99e7820bc74818d8f0b97d865db3f65761e7424a Mon Sep 17 00:00:00 2001
From: Ricky <11748854@qq.com>
Date: Mon, 31 Aug 2020 10:48:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=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

---
 .../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, 14 insertions(+), 7 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 109511b18..0433be867 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,11 +51,21 @@ 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 f21285364..627405e0a 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,11 +56,8 @@ public class BaseController
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
-        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
-        {
-            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
-            PageHelper.startPage(pageNum, pageSize, orderBy);
-        }
+        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 0efd82b32..4589439f6 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));
-        pageDomain.setPageSize(ServletUtils.getParameterToInt(Constants.PAGE_SIZE));
+        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.setOrderByColumn(ServletUtils.getParameter(Constants.ORDER_BY_COLUMN));
         pageDomain.setIsAsc(ServletUtils.getParameter(Constants.IS_ASC));
         return pageDomain;

From d830c9fd18a0912132a566eced96f744a45aac86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=98=A6=E5=85=AB=E7=88=B7?= <rqxiong@126.com>
Date: Mon, 31 Aug 2020 19:22:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E4=BB=A5=E5=90=8E=EF=BC=8C=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?IP=E6=88=96=E5=9F=9F=E5=90=8D=E8=AE=BF=E9=97=AE=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=8A=A5500=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/system/SysIndexController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
index 28d4bf068..efd758e2d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
@@ -28,7 +28,7 @@ public class SysIndexController extends BaseController
     private ISysConfigService configService;
 
     // 系统首页
-    @GetMapping("/index")
+    @GetMapping({"/index","/"})
     public String index(ModelMap mmap)
     {
         // 取身份信息