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 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 convertAncestors(Dept dept, List deptList, List 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);