From 7f51043517500dece7923ee7d2306bd39959e50c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 06 May 2022 15:31:56 +0800
Subject: [PATCH] 20220505

---
 zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java
index 595fefd..fa55605 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java
@@ -8,6 +8,7 @@
 import com.matrix.core.pojo.AjaxResult;
 import com.matrix.core.pojo.PaginationVO;
 import com.matrix.core.tools.DateUtil;
+import com.matrix.core.tools.StringUtils;
 import com.matrix.core.tools.WebUtil;
 import com.matrix.system.common.bean.CustomerDataDictionary;
 import com.matrix.system.common.bean.SysUsers;
@@ -86,6 +87,14 @@
         PaginationVO pageVo = new PaginationVO();
         pageVo.setOffset(offset);
         pageVo.setLimit(limit);
+
+        //默认排序
+        if (StringUtils.isBlank(pageVo.getSort())) {
+            pageVo.setSort("create_time");
+        }
+        if (StringUtils.isBlank(pageVo.getOrder())) {
+            pageVo.setOrder("desc");
+        }
 
         return showList(vipInfoService, vipInfo, pageVo);
     }
@@ -212,7 +221,7 @@
 
         SysProjUse sysProjUse = new SysProjUse();
         sysProjUse.setType(Dictionary.SHOPPING_GOODS_TYPE_TC);
-        List<SysProjUse> projUseList =sysProjUseService.findInPage(sysProjUse,null);
+        List<SysProjUse> projUseList =sysProjUseService.findInPage(sysProjUse,pageVo);
         //设置套餐中的项目
         projUseList.forEach(taocanProjUse -> {
             taocanProjUse.setTaocanProjUse(sysProjUseService.selectTaocanProjUse(taocanProjUse.getId(),sysProjUse.getStatus()));

--
Gitblit v1.9.1