From 7e6e39330b1e2ef5d2499c227b0487baa084e461 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Sun, 2 Jun 2024 20:54:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=9B=B4=E6=96=B0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=83=A8=E9=97=A8=E7=9A=84=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=AD=97=E6=AE=B5=20ancestors?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/zdxt/app/task/UpdateDeptTask.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UpdateDeptTask.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UpdateDeptTask.java
index 9016276a..eb2547ee 100644
--- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UpdateDeptTask.java
+++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UpdateDeptTask.java
@@ -56,7 +56,7 @@ public class UpdateDeptTask {
         for (Dept dept : deptList) {
             List<String> ancs = new ArrayList<>();
             ancs = convertAncestors(dept, deptList, ancs);
-            ancs.add("0");
+            ancs.add(null);
             Collections.reverse(ancs);
             String anc = String.join(",", ancs);
             dept.setAncestors(anc);
@@ -67,6 +67,7 @@ public class UpdateDeptTask {
 
     private List<String> convertAncestors(Dept dept, List<Dept> deptList, List<String> ancs) {
         for (Dept tmp : deptList) {
+            if (StringUtils.isEmpty(dept.getParentId()) || StringUtils.isEmpty(dept.getDeptId())) { return ancs; }
             if (dept.getParentId().equals(tmp.getDeptId()) && !dept.getDeptId().equals(tmp.getDeptId())) {
                 ancs.add(tmp.getDeptId());
                 return convertAncestors(tmp, deptList, ancs);