From b9cebcdeb00fe936086486f02b4bb134c5e4756e Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Thu, 21 May 2020 13:33:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/OpCustomerDOMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/OpCustomerDOMapper.xml b/src/main/resources/mapper/OpCustomerDOMapper.xml
index e42cc25..878759c 100644
--- a/src/main/resources/mapper/OpCustomerDOMapper.xml
+++ b/src/main/resources/mapper/OpCustomerDOMapper.xml
@@ -126,7 +126,7 @@
 
     <!--店铺ids→客户组织-->
     <select id="selectCustomerOrgByShopIds" resultType="com.kiisoo.ic.customer.entity.ShopOrgInfoVO">
-        select t1.id as customerId,t1.`name` as customerName, t1.parent_id as companyId, t3.entity_id as shopId, t4.`name` as shopName
+        select t1.id as customerId,t1.`name` as customerName, t1.parent_id as companyId, t3.entity_id as shopId, ifnull(t4.`abbreviation`,t4.`name`) as shopName
         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