From c59db1526c6430a0071936bd5021f14b3304e8a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=A3=E4=BA=9B=E8=8A=B1=E5=84=BF?= <1156921458@qq.com>
Date: Wed, 11 Jun 2025 10:43:51 +0800
Subject: [PATCH] ..

---
 .../app/sys/controller/SysUnitController.java | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/budwk/app/sys/controller/SysUnitController.java b/src/main/java/com/budwk/app/sys/controller/SysUnitController.java
index eaf8f74..9e25c88 100644
--- a/src/main/java/com/budwk/app/sys/controller/SysUnitController.java
+++ b/src/main/java/com/budwk/app/sys/controller/SysUnitController.java
@@ -3,6 +3,10 @@ package com.budwk.app.sys.controller;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.lang.tree.TreeNode;
+import cn.hutool.core.lang.tree.TreeUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.constant.RoleConstant;
@@ -277,16 +281,25 @@ public class SysUnitController {
             cnd.andEX("id", "=", pid);
             cnd.asc("unitcode");
             List<Sys_unit> list = sysUnitService.query(cnd);
-            NutMap menuMap = NutMap.NEW();
-            for (Sys_unit unit : list) {
-                List<Sys_unit> list1 = menuMap.getList(unit.getParentId(), Sys_unit.class);
-                if (list1 == null) {
-                    list1 = new ArrayList<>();
-                }
-                list1.add(unit);
-                menuMap.put(unit.getParentId(), list1);
+
+            List<TreeNode<String>> nodeList = CollUtil.newArrayList();
+            for (int i = 0; i < list.size(); i++) {
+                nodeList.add(new TreeNode<>(list.get(i).getId(), list.get(i).getParentId(), list.get(i).getName(), i));
             }
-            return Result.success().addData(getTree(menuMap, null));
+            List<Tree<String>> treeList = TreeUtil.build(nodeList, "1");
+
+//            NutMap menuMap = NutMap.NEW();
+//            for (Sys_unit unit : list) {
+//                List<Sys_unit> list1 = menuMap.getList(unit.getParentId(), Sys_unit.class);
+//                if (list1 == null) {
+//                    list1 = new ArrayList<>();
+//                }
+//                list1.add(unit);
+//                menuMap.put(unit.getParentId(), list1);
+//            }
+//            return Result.success().addData(getTree(menuMap, null));
+
+            return Result.success(treeList);
         } catch (Exception e) {
             return Result.error();
         }