From 32f94d9cf15a860e2e0da56078854657f1847d0b Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Fri, 5 Jul 2024 16:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=8E=AF=E4=BF=9D=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=20-=20App=E7=AB=AF=E7=9A=84=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E6=A3=80=E6=9F=A5=E7=A1=AE=E8=AE=A4=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/AppSafetyEnvironmentalExplainController.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalExplainController.java b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalExplainController.java
index 6a5d43c3..d9d534a5 100644
--- a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalExplainController.java
+++ b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalExplainController.java
@@ -61,7 +61,10 @@ public class AppSafetyEnvironmentalExplainController extends BaseController {
             PageData condition = new PageData();
             condition.put("DEPARTMENT_ID",vector.getString("INSPECTED_DEPARTMENT_ID"));
             List<PageData> parent_list = departmentService.getGenealogy(condition);
-            String corp_infos = parent_list.stream().map(n -> n.getString("NAME")).collect(Collectors.joining("-"));
+            String corp_infos = "";
+            if(parent_list != null) {
+                corp_infos = parent_list.stream().map(n -> n.getString("NAME")).collect(Collectors.joining("-"));
+            }
             vector.put("INSPECTED_DEPARTMENT_NAMES",corp_infos);
         }
         map.put("varList", varList);