From 4e89be5fc51ed51d8f75423adf335ccd8f935709 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 5 Feb 2021 09:31:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/AreaCodeDictResultDTO.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AreaCodeDictResultDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AreaCodeDictResultDTO.java
index 641ce7cf78..eb9a658257 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AreaCodeDictResultDTO.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AreaCodeDictResultDTO.java
@@ -31,7 +31,6 @@ public class AreaCodeDictResultDTO implements Serializable {
      */
     private List<AreaCodeDictResultDTO> children;
 
-    @JsonIgnore
     private String parentCode;
 
     public AreaCodeDictResultDTO() {

From cb1ef62f8fe8982920ded8aee2ef022f4ca2a096 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 5 Feb 2021 10:47:19 +0800
Subject: [PATCH 2/2] parentCode

---
 .../main/java/com/epmet/service/impl/AreaCodeServiceImpl.java   | 2 ++
 1 file changed, 2 insertions(+)

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 b511cab2c0..029d835475 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
@@ -342,6 +342,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
                 AreaCodeDictResultDTO dto = new AreaCodeDictResultDTO();
                 dto.setCode(three.getCountyCode());
                 dto.setName(three.getCountyName());
+                dto.setParentCode(c);
                 threeResult.add(dto);
             });
             List<AreaCodeDictResultDTO> threeSort = threeResult.stream().sorted(Comparator.comparing(AreaCodeDictResultDTO::getCode)).collect(Collectors.toList());
@@ -393,6 +394,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
                         AreaCodeDictResultDTO fiveDto = new AreaCodeDictResultDTO();
                         fiveDto.setCode(five.getCode());
                         fiveDto.setName(five.getName());
+                        fiveDto.setParentCode(pCode);
                         fiveResult.add(fiveDto);
                     });
                     List<AreaCodeDictResultDTO> fiveSort = fiveResult.stream().sorted(Comparator.comparing(AreaCodeDictResultDTO::getCode)).collect(Collectors.toList());