From 55cb9521a40ed10a65273df16d9c1791ff810aba Mon Sep 17 00:00:00 2001
From: wyj2080 <1603068044@qq.com>
Date: Wed, 22 Apr 2020 16:24:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7Id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kiisoo/ic/customer/entity/CustomerViewZeroExtendVO.java    | 1 +
 .../com/kiisoo/ic/customer/service/CustomerViewService.java    | 3 +++
 src/main/resources/mapper/OpCustomerDOMapper.xml               | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/kiisoo/ic/customer/entity/CustomerViewZeroExtendVO.java b/src/main/java/com/kiisoo/ic/customer/entity/CustomerViewZeroExtendVO.java
index cd6e5dd..e16e533 100644
--- a/src/main/java/com/kiisoo/ic/customer/entity/CustomerViewZeroExtendVO.java
+++ b/src/main/java/com/kiisoo/ic/customer/entity/CustomerViewZeroExtendVO.java
@@ -33,6 +33,7 @@ public class CustomerViewZeroExtendVO {
     private Long companyId;
     private String company;
     /**客户*/
+    private Long customerId;
     private String customer;
     /**推广数*/
     private Integer numb;
diff --git a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
index 3233c82..5df0f32 100644
--- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
+++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
@@ -370,6 +370,9 @@ public class CustomerViewService {
      * @param shopList 店铺list
      */
     public void getShopRegionInfo(List<CustomerViewZeroExtendVO> shopList){
+        if(shopList.size() == 0){
+            return;
+        }
         //零售公司信息
         List<Long> orgIds = shopList.stream().map(CustomerViewZeroExtendVO::getParentId).collect(Collectors.toList());
         if(orgIds.size() == 0){
diff --git a/src/main/resources/mapper/OpCustomerDOMapper.xml b/src/main/resources/mapper/OpCustomerDOMapper.xml
index 3d2a3b3..90507c5 100644
--- a/src/main/resources/mapper/OpCustomerDOMapper.xml
+++ b/src/main/resources/mapper/OpCustomerDOMapper.xml
@@ -115,7 +115,7 @@
 
     <!--店铺ids→零售公司信息-->
     <select id="selectOrgInfoByShopIds" resultType="com.kiisoo.ic.customer.entity.CustomerViewZeroExtendVO">
-        select t1.id as orgId,t1.`name` as customer, t3.entity_id as shopId, t4.name as shopName, t4.code as shopCode, t1.parent_id as parentId
+        select t1.id as customerId,t1.`name` as customer, t3.entity_id as shopId, t4.name as shopName, t4.code as shopCode, t1.parent_id as parentId
         from privilage_organizational t1, privilage_organizational_domain t2, privilage_domain_entity t3, poi_store t4
         where t1.id = t2.org_id
         and t2.domain_id = t3.domain_id