From 68e27f881f58fadefaaa45a202c2e3b656ed21e9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 9 Jul 2021 17:10:46 +0800
Subject: [PATCH] NullPointerEx fix trytry

---
 .../screen/impl/AgencyServiceImpl.java            | 15 ++++++++++++---
 .../com/epmet/dto/result/ParentListResultDTO.java |  5 +++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
index 062b632e09..538df72f10 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
@@ -468,18 +468,27 @@ public class AgencyServiceImpl implements AgencyService {
         return agencysResultDTO;
     }
 
-    private List<ParentListResultDTO> getParentListMultic(List<ParentListResultDTO> resList,ScreenCustomerAgencyDTO firstParent, String currentUserCustomerId, String rootAgencyId) {
+    private List<ParentListResultDTO> getParentListMultic(List<ParentListResultDTO> resList, ScreenCustomerAgencyDTO firstParent, String currentUserCustomerId, String rootAgencyId) {
         ParentListResultDTO resultDTO = new ParentListResultDTO();
         resultDTO.setId(firstParent.getAgencyId());
         resultDTO.setName(firstParent.getAgencyName());
         resultDTO.setLevel(firstParent.getLevel());
+        resultDTO.setAreaCode(firstParent.getAreaCode());
         resList.add(resultDTO);
         if (firstParent.getCustomerId().equals(currentUserCustomerId) && firstParent.getAgencyId().equals(rootAgencyId)) {
             Collections.reverse(resList);
             return resList;
         } else {
-            ScreenCustomerAgencyDTO parentAgency = screenCustomerAgencyDao.selectByAreaCode(firstParent.getParentAreaCode());
-            return getParentListMultic(resList,parentAgency, currentUserCustomerId, rootAgencyId);
+            String parentAgencyAreaCode = firstParent.getParentAreaCode();
+            if (StringUtils.isNotBlank(parentAgencyAreaCode)) {
+                parentAgencyAreaCode = parentAgencyAreaCode.replaceAll("(0)+$", "");
+            }
+            ScreenCustomerAgencyDTO parentAgency = screenCustomerAgencyDao.selectByAreaCode(parentAgencyAreaCode);
+            if (null != parentAgency) {
+                return getParentListMultic(resList, parentAgency, currentUserCustomerId, rootAgencyId);
+            } else {
+                return resList;
+            }
         }
     }
 
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java
index 421ecabd25..b9222196f9 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java
@@ -46,4 +46,9 @@ public class ParentListResultDTO implements Serializable {
      *  省级:province; 市级: city; 区县级: district ;乡（镇、街道）级:street ;社区级：community
      */
     private String level="";
+
+    /**
+     * 增加此返回值，为了调试用
+     */
+    private String areaCode;
 }
\ No newline at end of file