From ffd3d6252f111f33c92faa99dc80c050d53ac929 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 14 Apr 2021 13:59:43 +0800
Subject: [PATCH] =?UTF-8?q?nextlevelareacodelist=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/govorg/CustomerAgencyDao.xml      | 2 +-
 .../src/main/resources/mapper/opercrm/CustomerRelationDao.xml   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
index f27f969e31..fda4f7245c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
@@ -24,7 +24,7 @@
 
     <select id="selectUsedAreaCodeList" parameterType="java.lang.String" resultType="java.lang.String">
         SELECT
-            ca.AREA_CODE
+            distinct ca.AREA_CODE
         FROM
             customer_agency ca
         WHERE
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercrm/CustomerRelationDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercrm/CustomerRelationDao.xml
index 5c0ec4f533..169a44070f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercrm/CustomerRelationDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercrm/CustomerRelationDao.xml
@@ -10,6 +10,7 @@
             customer_relation cr
         WHERE
             cr.DEL_FLAG = '0'
+            and  cr.CUSTOMER_TYPE='external'
             AND cr.AREA_CODE LIKE concat(#{areaCode}, '%')
             AND cr.AREA_CODE != #{areaCode}
     </select>