From ce53355d75dbccad26956f098e3092f55ea81b33 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 12 Apr 2022 15:16:04 +0800
Subject: [PATCH] areaCodePath

---
 .../com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java | 2 ++
 .../dataaggre/service/govorg/impl/GovOrgServiceImpl.java  | 2 +-
 .../main/resources/mapper/govorg/CustomerAgencyDao.xml    | 8 ++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
index c9ebd4bf8d..8b64711e1f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
@@ -105,4 +105,6 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @author sun
      */
     LinkedList<GridLivelyResultDTO> subAgencyListAndGridSumNum(@Param("agencyId") String agencyId);
+
+    CustomerAgencyEntity selectByAgencyId(@Param("agencyId")String agencyId);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index dd8f54cab7..0b6944ce68 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -609,7 +609,7 @@ public class GovOrgServiceImpl implements GovOrgService {
      */
     @Override
     public CustomerAgencyEntity getAgencyInfo(String agencyId) {
-        CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectById(agencyId);
+        CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectByAgencyId(agencyId);
         //设置行政地区编码全路径
         if (StringUtils.isNotBlank(customerAgencyEntity.getAreaCode()) && StringUtils.isNotBlank(customerAgencyEntity.getParentAreaCode())) {
             customerAgencyEntity.setAreaCodePath(queryAreaCodePath(customerAgencyEntity));
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 e5594fdb5e..9e654e9bec 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
@@ -299,4 +299,12 @@
         ORDER BY created_time ASC
     </select>
 
+    <select id="selectByAgencyId" parameterType="map" resultType="com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity">
+        select ca.*
+        FROM
+            customer_agency ca
+        WHERE
+         id = #{agencyId}
+         and del_flag = '0'
+    </select>
 </mapper>