Merge branch 'dev' into 'main'

Dev

See merge request !210

ruoyi-system/src/main/java/com/ruoyi/system/service/grid/GridRegionFacadeService.java

@@ -413,6 +413,7 @@ public class GridRegionFacadeService {
             treeNodes.setName("网格角色");
         } else {
             treeNodes = listToTree(gridRegionList);
+//
 
         }
         return treeNodes;
@@ -836,6 +837,16 @@ public class GridRegionFacadeService {
             }
             res.get(0).setChild(degree_second);
         }
+
+        List<GridTreeNode> childWithoutNull = res.get(0).getChild();
+        List<GridTreeNode> childNew = new ArrayList<>();
+        for(GridTreeNode gridTreeNode : childWithoutNull){
+            if(!gridTreeNode.getChild().isEmpty()){
+                childNew.add(gridTreeNode);
+            }
+        }
+        res.get(0).setChild(childNew);
+
         return res;
     }
 
@@ -1310,6 +1321,20 @@ public class GridRegionFacadeService {
             res.get(0).setChild(degree_second);
         }
 
+        List<GridTreeNode> childWithoutNull = res.get(0).getChild();
+        for(GridTreeNode gridTreeNode : childWithoutNull){
+            List<GridTreeNode> childOld = gridTreeNode.getChild();
+            List<GridTreeNode> childNew = new ArrayList<>();
+            for(GridTreeNode child : childOld){
+                if(!child.getChild().isEmpty()){
+                    childNew.add(child);
+                }
+            }
+            gridTreeNode.setChild(childNew);
+        }
+        res.get(0).setChild(childWithoutNull);
+
+
 
         return res;
     }