From 00465aaba3a028fd8d0d3ab00d065bf0a604e36c Mon Sep 17 00:00:00 2001
From: Caps <452713115@qq.com>
Date: Fri, 24 Apr 2020 23:55:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=9B=9E=E8=B0=83=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kiisoo/ic/generalize/service/RetailCompanyService.java   | 5 +----
 src/main/resources/mapper/PoiStoreDOMapper.xml               | 2 +-
 src/main/resources/mapper/RetailCompanyMapper.xml            | 4 +++-
 3 files changed, 5 insertions(+), 6 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 a143c86..84fac1e 100644
--- a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
+++ b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
@@ -540,10 +540,7 @@ public class RetailCompanyService {
         List<Map<String, Object>> map3 = opSellerCustomerRelationDOMapper.selectAllCustomer1(sellerIds);
         Map<Long, Object> collect1 = map3 == null ? new HashMap<>() : map3.stream().collect(Collectors.toMap(m -> Long.parseLong(m.get("store_id").toString()), m1 -> m1.get("count")));
 
-        QueryWrapper<PoiStoreStaff> wrapper1 = new QueryWrapper<>();
-        wrapper1.in("user_id", sellerIds);
-
-        List<PoiStoreStaff> list1 = poiStoreStaffDOMapper.selectList(wrapper1);
+        List<PoiStoreStaff> list1 = poiStoreStaffDOMapper.selectList(null);
         Map<Long, PoiStoreStaff> map2 = list1.stream().collect(Collectors.toMap(PoiStoreStaff::getId, p -> p));
 
         sellerIds.stream().parallel().forEach(seller -> {
diff --git a/src/main/resources/mapper/PoiStoreDOMapper.xml b/src/main/resources/mapper/PoiStoreDOMapper.xml
index 629c4ba..3f1dbc0 100644
--- a/src/main/resources/mapper/PoiStoreDOMapper.xml
+++ b/src/main/resources/mapper/PoiStoreDOMapper.xml
@@ -24,7 +24,7 @@
         privilage_domain_entity t4,
         poi_store t5
         where t2.id = t3.org_id
-        and t2.id = t3.parent_id
+        and t2.parent_id = t6.id
         and t1.store_id = t5.id
         and t3.domain_id = t4.domain_id
         and t4.type = 3
diff --git a/src/main/resources/mapper/RetailCompanyMapper.xml b/src/main/resources/mapper/RetailCompanyMapper.xml
index 99cb983..593ec7e 100644
--- a/src/main/resources/mapper/RetailCompanyMapper.xml
+++ b/src/main/resources/mapper/RetailCompanyMapper.xml
@@ -24,11 +24,13 @@
     </select>
     <select id="selectSellerIdsByShop" resultType="java.lang.Long">
         select t4.user_id
-        from privilage_organizational t1,
+        from privilage_organizational t,
+        privilage_organizational t1,
         privilage_organizational_domain t2,
         privilage_domain_entity t3,
         poi_store_staff t4
         where t1.id = t2.org_id
+        and t.id = t1.parent_id
         and t2.domain_id = t3.domain_id
         and t3.entity_id = t4.store_id
         and t3.type = 3