From 6fbe111c62a592d766f057655703a20db5cc7a7d Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 26 May 2020 10:08:23 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=EF=BC=9Alogo=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AFnull=E8=BD=AC?=
 =?UTF-8?q?=E5=8C=96=E4=B8=BA=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/CustomerServiceImpl.java   | 2 +-
 .../src/main/resources/mapper/CustomerDao.xml              | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
index 2e3791113e..9510e0631d 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
@@ -147,7 +147,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
             validCustomers.stream().forEach(customer -> {
                 CustomerAgencyDTO rootAgency = rootAgencies.get(customer.getCustomerId());
                 customer.setHasRootAgency(rootAgency == null ? false : true);
-                customer.setRootAgencyId(rootAgency == null ? null : rootAgency.getId());
+                customer.setRootAgencyId(rootAgency == null ? "" : rootAgency.getId());
                 if (rootAgency != null) {
                     rootAgencyIds.add(rootAgency.getId());
                 }
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
index 40be773fe0..8ed4314464 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
@@ -24,10 +24,9 @@
 
     <!--   运营端-获取有效客户列表 (未删除+有效期内的，按照客户名称排序 )-->
     <select id="selectListValidCustomerResultDTO" resultType="com.epmet.dto.result.ValidCustomerResultDTO">
-        SELECT
-            c.id AS CUSTOMER_ID,
-            c.CUSTOMER_NAME,
-            c.LOGO AS logo
+        SELECT c.id AS CUSTOMER_ID,
+               c.CUSTOMER_NAME,
+               CASE WHEN c.LOGO IS NULL THEN '' ELSE c.LOGO END AS LOGO
         FROM
             customer c
         WHERE