From 7cc761d7d514576e297ad8a618b2f87cd1864916 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Tue, 26 Jul 2022 14:03:12 +0800
Subject: [PATCH] =?UTF-8?q?order/master/app/list=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/OrderMasterController.java          | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 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 8429e450..84ae37f2 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
@@ -88,7 +88,7 @@ public class OrderMasterController extends BaseController {
     @PostMapping("/app/list")
     @ResponseBody
     public TableDataInfo appList(@RequestBody OrderMaster orderMaster) {
-        TableDataInfo rspData = new TableDataInfo();
+//        TableDataInfo rspData = new TableDataInfo();
         startPage();
         List<OrderListResponse> orderListResponses = new ArrayList<>();
         List<OrderMaster> list = orderMasterService.selectOrderMasterList(orderMaster);
@@ -150,19 +150,19 @@ public class OrderMasterController extends BaseController {
 
         });
 
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize()) {
-            rspData.setRows(orderListResponses);
-            rspData.setTotal(orderListResponses.size());
-            return rspData;
-        }
-        Integer pageSize = pageDomain.getPageNum();
-        if (pageSize > orderListResponses.size()) {
-            pageSize = orderListResponses.size();
-        }
-        rspData.setRows(orderListResponses.subList(0, pageSize));
-        rspData.setTotal(orderListResponses.size());
-        return rspData;
+//        PageDomain pageDomain = TableSupport.buildPageRequest();
+//        if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize()) {
+//            rspData.setRows(orderListResponses);
+//            rspData.setTotal(orderListResponses.size());
+//            return rspData;
+//        }
+//        Integer pageSize = pageDomain.getPageNum();
+//        if (pageSize > orderListResponses.size()) {
+//            pageSize = orderListResponses.size();
+//        }
+//        rspData.setRows(orderListResponses.subList(0, pageSize));
+//        rspData.setTotal(orderListResponses.size());
+        return voDataTable(orderListResponses, list);
     }
 
     @PostMapping("/app/detail")