Merge remote-tracking branch 'origin/release' into release

2 years ago · b1c83de237
parent 5e4cb74a70 dd5c6586f0
commit b1c83de237
1 changed files with 5 additions and 3 deletions
--- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java
+++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java
@ -67,9 +67,11 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptDao, SysDeptEntity> i
        List<SysDeptEntity> returnList = new ArrayList<>();
        for (SysDeptEntity t : list) {
            // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
-            if (t.getParentId() == parentId) {
-                recursionFn(list, t);
-                returnList.add(t);
+            if(t.getParentId() != null) {
+                if (t.getParentId() == parentId) {
+                    recursionFn(list, t);
+                    returnList.add(t);
+                }
            }
        }
        return returnList;