Merge branch 'dev' into 'main'

Dev

See merge request !95

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

@@ -1181,25 +1181,25 @@ public class GridRegionFacadeService {
             secondFiveTreeNode4.setName("道路");
             secondFiveTreeNode4.setChild(new ArrayList<>());
             secondFiveTreeNode4.setStatus("2");
-            secondFiveTreeNode1.setLevel("2.5");
+            secondFiveTreeNode4.setLevel("2.5");
             GridTreeNode secondFiveTreeNode5 = new GridTreeNode();
             secondFiveTreeNode5.setId(UUID.randomUUID().toString());
             secondFiveTreeNode5.setName("街区");
             secondFiveTreeNode5.setChild(new ArrayList<>());
             secondFiveTreeNode5.setStatus("2");
-            secondFiveTreeNode1.setLevel("2.5");
+            secondFiveTreeNode5.setLevel("2.5");
             GridTreeNode secondFiveTreeNode6 = new GridTreeNode();
             secondFiveTreeNode6.setId(UUID.randomUUID().toString());
             secondFiveTreeNode6.setName("综合体");
             secondFiveTreeNode6.setChild(new ArrayList<>());
             secondFiveTreeNode6.setStatus("2");
-            secondFiveTreeNode1.setLevel("2.5");
+            secondFiveTreeNode6.setLevel("2.5");
             GridTreeNode secondFiveTreeNode7 = new GridTreeNode();
             secondFiveTreeNode7.setId(UUID.randomUUID().toString());
             secondFiveTreeNode7.setName("市场");
             secondFiveTreeNode7.setChild(new ArrayList<>());
             secondFiveTreeNode7.setStatus("2");
-            secondFiveTreeNode1.setLevel("2.5");
+            secondFiveTreeNode7.setLevel("2.5");
             secondFiveTree.add(secondFiveTreeNode1);
             secondFiveTree.add(secondFiveTreeNode4);
             secondFiveTree.add(secondFiveTreeNode5);
@@ -1243,7 +1243,7 @@ public class GridRegionFacadeService {
 
     private GridTreeNode convertNodeToTree(GridRegion gridRegion){
         GridTreeNode firstNode = new GridTreeNode();
-//        firstNode.setLevel("1");
+        firstNode.setLevel(gridRegion.getLevel());
         firstNode.setCode(gridRegion.getWgCode());
         firstNode.setName(gridRegion.getWgName());
         firstNode.setId(gridRegion.getId());