From c7ab35741be81a8a4d102d9ad527c69225f9cf35 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 6 Jan 2022 18:24:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9=E4=B8=8B?=
 =?UTF-8?q?=EF=BC=8C=E8=B5=8B=E5=80=BCareaName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/AgencyServiceImpl.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index c810c45a28..ba1434749a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -315,19 +315,19 @@ public class AgencyServiceImpl implements AgencyService {
         if (null != entity && StringUtils.isNotBlank(entity.getAreaCode())) {
             switch (entity.getLevel()) {
                 case CustomerAgencyConstant.PROVINCE_LEVEL:
-                    agencysResultDTO.setAreaName(null == entity.getProvince() ? StrConstant.EPMETY_STR : entity.getProvince());
+                    agencysResultDTO.setAreaName(StringUtils.isNotBlank(entity.getProvince()) ?  entity.getProvince():entity.getOrganizationName());
                     break;
                 case CustomerAgencyConstant.CITY_LEVEL:
-                    agencysResultDTO.setAreaName(null == entity.getCity() ? StrConstant.EPMETY_STR : entity.getCity());
+                    agencysResultDTO.setAreaName(StringUtils.isNotBlank(entity.getCity()) ? entity.getCity():entity.getOrganizationName());
                     break;
                 case CustomerAgencyConstant.DISTRICT:
-                    agencysResultDTO.setAreaName(null == entity.getDistrict() ? StrConstant.EPMETY_STR : entity.getDistrict());
+                    agencysResultDTO.setAreaName(StringUtils.isNotBlank(entity.getDistrict()) ?  entity.getDistrict():entity.getOrganizationName());
                     break;
                 case CustomerAgencyConstant.STREET_LEVEL:
-                    agencysResultDTO.setAreaName(null == entity.getStreet() ? StrConstant.EPMETY_STR : entity.getStreet());
+                    agencysResultDTO.setAreaName(StringUtils.isNotBlank(entity.getStreet()) ?  entity.getStreet():entity.getOrganizationName());
                     break;
                 case CustomerAgencyConstant.COMMUNITY_LEVEL:
-                    agencysResultDTO.setAreaName(null == entity.getCommunity() ? StrConstant.EPMETY_STR : entity.getCommunity());
+                    agencysResultDTO.setAreaName(StringUtils.isNotBlank(entity.getCommunity()) ? entity.getCommunity():entity.getOrganizationName());
                     break;
                 default:
                     agencysResultDTO.setAreaName(StrConstant.EPMETY_STR);