From c72137906077779d251534681a239c2714ad250c Mon Sep 17 00:00:00 2001
From: Caps <452713115@qq.com>
Date: Sun, 26 Apr 2020 17:38:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E7=AE=A1=E7=90=86=E9=9B=B6?=
 =?UTF-8?q?=E5=94=AE=E5=85=AC=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kiisoo/ic/generalize/service/RetailCompanyService.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
index 4101927..8e7243a 100644
--- a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
+++ b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
@@ -281,6 +281,7 @@ public class RetailCompanyService {
      * @return 零售公司的推广数据
      */
     public OrganizationVO generalizeOfRetail(Long userId,String startTime, String endTime, Long orgId, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum,pageSize);
         List<PrivilageOrganizational> listOfOrg = listOfRetailCompany(userId, null,orgId);
 
         List<RetailOrganizationalVO> list = new ArrayList<>();
@@ -468,13 +469,13 @@ public class RetailCompanyService {
      */
     public OrganizationVO generalizeOfStore(long userId,String startTime, String endTime, Long orgId, Long shopId, int pageNum, int pageSize) {
         //根据零售公司查询门店
-        PageHelper.startPage(pageNum, pageSize);
         List<Long> shopIds = new ArrayList<>();
         if(shopId != null){
             shopIds.add(shopId);
         }else {
             shopIds = privilageDomainService.listUserDatePermission(userId);
         }
+        PageHelper.startPage(pageNum, pageSize);
         List<CompanyStoreDO> list = retailCompanyMapper.selectShopIdByRetail(orgId, shopIds);
 
         //查询所有的店铺信息
@@ -551,13 +552,13 @@ public class RetailCompanyService {
      */
     public OrganizationVO generalizeOfSeller(long userId,String startTime, String endTime, Long orgId, Long shopId, Long sellerId, int pageNum, int pageSize) {
         //根据零售公司查询门店
-        PageHelper.startPage(pageNum, pageSize);
         List<Long> shopIds = new ArrayList<>();
         if(shopId != null){
             shopIds.add(shopId);
         }else {
             shopIds = privilageDomainService.listUserDatePermission(userId);
         }
+        PageHelper.startPage(pageNum, pageSize);
         List<Long> sellerIds = retailCompanyMapper.selectSellerIdsByShop(orgId, shopIds, sellerId);
         List<SellerOrganizationalVO> list = new ArrayList<>();