From 681f7659a08072ff455ae3a0edb9dbb2d22b05b5 Mon Sep 17 00:00:00 2001
From: Caps <452713115@qq.com>
Date: Fri, 24 Apr 2020 23:46:43 +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 ++
 .../ic/generalize/service/RetailCompanyService.java       | 2 +-
 src/main/resources/mapper/RetailCompanyMapper.xml         | 8 +++++---
 3 files changed, 8 insertions(+), 4 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 6480720..e4f3b80 100644
--- a/src/main/java/com/kiisoo/ic/generalize/entity/CompanyStoreDO.java
+++ b/src/main/java/com/kiisoo/ic/generalize/entity/CompanyStoreDO.java
@@ -16,6 +16,8 @@ public class CompanyStoreDO {
      */
     private String orgId;
 
+    private String parentId;
+
     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 fb7c971..a143c86 100644
--- a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
+++ b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
@@ -465,7 +465,7 @@ public class RetailCompanyService {
 
         list.stream().parallel().forEach(li -> {
             QueryWrapper<PrivilageOrganizational> wrapperx = new QueryWrapper<>();
-            wrapperx.eq("id",li.getOrgId()).eq("level",2).last("limit 1");
+            wrapperx.eq("id",li.getParentId()).eq("level",2).last("limit 1");
             PrivilageOrganizational privilageOrganizational = retailCompanyMapper.selectOne(wrapperx);
 
             StoreOrganizationalVO storeOrganizationalVO = new StoreOrganizationalVO();
diff --git a/src/main/resources/mapper/RetailCompanyMapper.xml b/src/main/resources/mapper/RetailCompanyMapper.xml
index 4a45dfa..99cb983 100644
--- a/src/main/resources/mapper/RetailCompanyMapper.xml
+++ b/src/main/resources/mapper/RetailCompanyMapper.xml
@@ -6,15 +6,17 @@
     </insert>
 
     <select id="selectShopIdByRetail" resultType="com.kiisoo.ic.generalize.entity.CompanyStoreDO">
-        select t3.entity_id as shopId,t1.parent_id as orgId
-        from privilage_organizational t1,
+        select t3.entity_id as shopId,t1.id as orgId,t1.parent_id as parentId
+        from privilage_organizational t,
+        privilage_organizational t1,
         privilage_organizational_domain t2,
         privilage_domain_entity t3
         where t1.id = t2.org_id
+        and t.id = t1.parent_id
         and t2.domain_id = t3.domain_id
         and t3.type = 3
         <if test="orgId != null">
-            and t1.id = #{orgId}
+            and t.id = #{orgId}
         </if>
         <if test="shopId != null">
             and t3.entity_id = #{shopId}