From 854f49c81c7c4d09a59c422b125d48b33e56a5d8 Mon Sep 17 00:00:00 2001
From: Caps <452713115@qq.com>
Date: Fri, 24 Apr 2020 23:38:47 +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

---
 .../com/kiisoo/ic/generalize/entity/CompanyStoreDO.java     | 2 ++
 .../kiisoo/ic/generalize/service/RetailCompanyService.java  | 6 +++++-
 src/main/resources/mapper/PoiStoreDOMapper.xml              | 4 +++-
 src/main/resources/mapper/RetailCompanyMapper.xml           | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/generalize/entity/CompanyStoreDO.java b/src/main/java/com/kiisoo/ic/generalize/entity/CompanyStoreDO.java
index 55b5463..6480720 100644
--- a/src/main/java/com/kiisoo/ic/generalize/entity/CompanyStoreDO.java
+++ b/src/main/java/com/kiisoo/ic/generalize/entity/CompanyStoreDO.java
@@ -14,6 +14,8 @@ public class CompanyStoreDO {
     /**
      * 零售公司
      */
+    private String orgId;
+
     private String companyName;
 
     /**
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 65ebf32..fb7c971 100644
--- a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
+++ b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
@@ -464,6 +464,10 @@ public class RetailCompanyService {
         List<StoreOrganizationalVO> list1 = new ArrayList<>();
 
         list.stream().parallel().forEach(li -> {
+            QueryWrapper<PrivilageOrganizational> wrapperx = new QueryWrapper<>();
+            wrapperx.eq("id",li.getOrgId()).eq("level",2).last("limit 1");
+            PrivilageOrganizational privilageOrganizational = retailCompanyMapper.selectOne(wrapperx);
+
             StoreOrganizationalVO storeOrganizationalVO = new StoreOrganizationalVO();
             long count = 0;
             //查询所有的客户
@@ -487,7 +491,7 @@ public class RetailCompanyService {
             storeOrganizationalVO.setAllCustomer((int) count);
             storeOrganizationalVO.setEffectiveCustomer((int) countAble);
             storeOrganizationalVO.setDelCustomer((int) allAge);
-            storeOrganizationalVO.setCompanyName(li.getCompanyName());
+            storeOrganizationalVO.setCompanyName(privilageOrganizational.getName());
             storeOrganizationalVO.setDelRate(check(allAge, count));
             list1.add(storeOrganizationalVO);
         });
diff --git a/src/main/resources/mapper/PoiStoreDOMapper.xml b/src/main/resources/mapper/PoiStoreDOMapper.xml
index a21103e..629c4ba 100644
--- a/src/main/resources/mapper/PoiStoreDOMapper.xml
+++ b/src/main/resources/mapper/PoiStoreDOMapper.xml
@@ -16,13 +16,15 @@
         where t1.id = #{shopId}
     </select>
     <select id="selectCompanyStore" resultType="com.kiisoo.ic.generalize.entity.CompanyStoreDO">
-        select t2.name as companyName,t5.name as shopName,t5.code as shopCode
+        select t6.name as companyName,t5.name as shopName,t5.code as shopCode
         from poi_store_staff t1,
         privilage_organizational t2,
+        privilage_organizational t6,
         privilage_organizational_domain t3,
         privilage_domain_entity t4,
         poi_store t5
         where t2.id = t3.org_id
+        and t2.id = t3.parent_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 b508bd7..4a45dfa 100644
--- a/src/main/resources/mapper/RetailCompanyMapper.xml
+++ b/src/main/resources/mapper/RetailCompanyMapper.xml
@@ -6,7 +6,7 @@
     </insert>
 
     <select id="selectShopIdByRetail" resultType="com.kiisoo.ic.generalize.entity.CompanyStoreDO">
-        select t3.entity_id as shopId,t1.name as companyName
+        select t3.entity_id as shopId,t1.parent_id as orgId
         from privilage_organizational t1,
         privilage_organizational_domain t2,
         privilage_domain_entity t3