From 7e347d6dd75bfed6e3b89b80045115b042a7943a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 15 Jul 2021 23:03:12 +0800
Subject: [PATCH] '1'

---
 zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
index ae84a02..acfe1fd 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
@@ -115,7 +115,6 @@
         queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
         queryUse.setTaocanId(-1L);
         queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
-        queryUse.setIsOver(Dictionary.FLAG_NO_N);
         List<SysProjUse> projList = projUseService.findInPage(queryUse, null);
 
         List<List<Object>> list = new ArrayList<>();
@@ -238,9 +237,9 @@
     public @ResponseBody
     AjaxResult showList(PaginationVO pageVo, SysVipInfo vipInfo) {
 
-//        if (!getMe().getShopRole().equals(Dictionary.FLAG_YES_Y)) {
-        vipInfo.setShopId(getMe().getShopId());
-//        }
+
+        QueryUtil.setQueryLimit(vipInfo);
+
         return showList(vipInfoService, vipInfo, pageVo);
     }
 

--
Gitblit v1.9.1