From 6fe416cea374c17f540a6bb217ea3b0bdad3736b Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 6 Jul 2022 16:56:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/CustomerRelationTreeDTO.java | 15 +++++++++++++++
 .../main/resources/mapper/CustomerRelationDao.xml | 14 ++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerRelationTreeDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerRelationTreeDTO.java
index 17d72aff14..895e46051b 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerRelationTreeDTO.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerRelationTreeDTO.java
@@ -89,6 +89,21 @@ public class CustomerRelationTreeDTO implements Serializable {
      */
     private String areaName;
 
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    /**
+     * 有效期
+     */
+    private Date validityTime;
+
+    /**
+     * 客户logo
+     */
+    private String logo;
+
     /**
      * 下一级
      */
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerRelationDao.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerRelationDao.xml
index f23b339e58..da6018982b 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerRelationDao.xml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerRelationDao.xml
@@ -26,21 +26,31 @@
 
     <select id="selectRootCustomerByCustomerId" parameterType="java.lang.String" resultType="com.epmet.dto.result.CustomerRelationTreeDTO">
         SELECT
-            cr.*
+            cr.*,
+            c.CUSTOMER_NAME,
+            VALIDITY_TIME,
+            LOGO
         FROM
             customer_relation cr
+            LEFT JOIN customer c ON c.id = cr.CUSTOMER_ID
         WHERE
             cr.DEL_FLAG = '0'
+            AND c.DEL_FLAG = '0'
             AND cr.CUSTOMER_ID = #{customerId}
     </select>
 
     <select id="selectSubCustomerByPid" parameterType="java.lang.String" resultType="com.epmet.dto.result.CustomerRelationTreeDTO">
         SELECT
-            cr.*
+            cr.*,
+            c.CUSTOMER_NAME,
+            VALIDITY_TIME,
+            LOGO
         FROM
             customer_relation cr
+            LEFT JOIN customer c ON c.id = cr.CUSTOMER_ID
         WHERE
             cr.DEL_FLAG = '0'
+            AND c.DEL_FLAG = '0'
             AND cr.PARENT_CUSTOMER_ID = #{customerPid}
     </select>