Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/Bean/TDmArea.java

@@ -47,7 +47,7 @@ public class TDmArea {
 
     private boolean last;
 
-    public TDmArea(String title, String parentId, String area_code, String id, int is_leaf, boolean open, boolean last) {
+    public TDmArea(String title, String parentId, String area_code, String id, int is_leaf, boolean open, boolean last, int level_id) {
         this.title = title;
         this.parentId = parentId;
         this.area_code = area_code;
@@ -56,6 +56,7 @@ public class TDmArea {
         this.open = open;
         this.last = last;
         this.children = new ArrayList<>();
+        this.level_id = level_id;
     }
 
     private String title;
@@ -82,6 +83,8 @@ public class TDmArea {
     private int is_leaf;
     private boolean open;
 
+    private int level_id;
+
     public List<TDmArea> getChildren() {
         return children;
     }
@@ -95,4 +98,12 @@ public class TDmArea {
     public void addChild(TDmArea child) {
         this.children.add(child);
     }
+
+    public int getLevel_id() {
+        return level_id;
+    }
+
+    public void setLevel_id(int level_id) {
+        this.level_id = level_id;
+    }
 }

src/main/java/com/dsideal/QingLong/Dm/Controller/DmController.java

@@ -167,7 +167,6 @@ public class DmController extends Controller {
     public void getAreaByParentId(String parent_id) {
         List<Record> dt = model.getAreaByParentId(parent_id);
         renderJson(CommonUtil.renderJsonForLayUI(dt, dt.size()));
-        return;
     }
 
     /**
@@ -272,8 +271,8 @@ public class DmController extends Controller {
         String pId = rootRecord.getStr("parent_id");
         boolean last = false;
         int is_leaf = 0;
-        if (level_id == 4) is_leaf = 1;
-        TDmArea rootNode = new TDmArea(area_name, pId, area_code, parent_id, is_leaf, true, last);
+        if (level_id == 5) is_leaf = 1;
+        TDmArea rootNode = new TDmArea(area_name, pId, area_code, parent_id, is_leaf, true, last,level_id);
 
         for (int i = 0; i < list.size(); i++) {
             Record record = list.get(i);
@@ -285,7 +284,7 @@ public class DmController extends Controller {
             is_leaf = record.getInt("is_leaf");
             last = is_leaf == 0 ? true : false;
             // 创建要添加的新节点
-            TDmArea newNode = new TDmArea(area_name, pId, area_code, id, is_leaf, false, last);
+            TDmArea newNode = new TDmArea(area_name, pId, area_code, id, is_leaf, false, last,level_id+1);
             rootNode.addChild(newNode);
         }
         JSONObject jo = new JSONObject();