From fb3fd4fe3d3720ad827594628f2d6e26e6ef25b6 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sat, 9 Jul 2022 18:40:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/web/controller/order/OrderMasterController.java | 5 ++---
 .../src/main/java/com/ghy/common/core/page/PageDomain.java  | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index 14c6a294..b7da2133 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -163,13 +163,12 @@ public class OrderMasterController extends BaseController {
             rspData.setTotal(orderListResponses.size());
             return rspData;
         }
-        Integer pageNum = pageDomain.getPageNum() * 10;
-        Integer pageSize = (pageDomain.getPageNum() + 1) * 10;
+        Integer pageSize = pageDomain.getPageNum() * 10;
         if (pageSize > orderListResponses.size())
         {
             pageSize = orderListResponses.size();
         }
-        rspData.setRows(orderListResponses.subList(pageNum, pageSize));
+        rspData.setRows(orderListResponses.subList(0, pageSize));
         rspData.setTotal(orderListResponses.size());
         return rspData;
     }
diff --git a/ghy-common/src/main/java/com/ghy/common/core/page/PageDomain.java b/ghy-common/src/main/java/com/ghy/common/core/page/PageDomain.java
index 91740ccc..1e5f47c5 100644
--- a/ghy-common/src/main/java/com/ghy/common/core/page/PageDomain.java
+++ b/ghy-common/src/main/java/com/ghy/common/core/page/PageDomain.java
@@ -4,7 +4,7 @@ import com.ghy.common.utils.StringUtils;
 
 /**
  * 分页数据
- * 
+ *
  * @author clunt
  */
 public class PageDomain
@@ -22,7 +22,7 @@ public class PageDomain
     private String isAsc = "asc";
 
     /** 分页参数合理化 */
-    private Boolean reasonable = true;
+    private Boolean reasonable = false;
 
     public String getOrderBy()
     {
@@ -77,7 +77,7 @@ public class PageDomain
     {
         if (StringUtils.isNull(reasonable))
         {
-            return Boolean.TRUE;
+            return Boolean.FALSE;
         }
         return reasonable;
     }