From 02077403e3c2278fd8565f7c95d1cd6d7c826748 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 19 Jul 2022 13:44:58 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/result/CustomerTreeDTO.java  | 5 +++++
 .../java/com/epmet/service/impl/AreaCodeServiceImpl.java     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/CustomerTreeDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/CustomerTreeDTO.java
index 08eec96007..20b99145db 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/CustomerTreeDTO.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/CustomerTreeDTO.java
@@ -64,6 +64,11 @@ public class CustomerTreeDTO implements Serializable {
      */
     private String areaName;
 
+    /**
+     * 当前客户的父节点地区名称
+     */
+    private String parentCode;
+
     /**
      * 客户名称
      */
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java
index 6d0289c1c4..b0f519a3ac 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java
@@ -797,7 +797,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
                 AreaCodeDTO city = baseDao.selectByCityCode(areaCode);
                 if (city != null) {
                     result.setAreaName(city.getCityName());
-                    result.setAreaCode(city.getCityName());
+                    result.setAreaCode(city.getCityCode());
                     result.setParentCode(city.getProvinceCode());
                     result.setLevel(AreaCodeConstant.CITY);
                     tree.add(result);