..
This commit is contained in:
@@ -3,6 +3,10 @@ package com.budwk.app.sys.controller;
|
|||||||
import cn.dev33.satoken.annotation.SaCheckLogin;
|
import cn.dev33.satoken.annotation.SaCheckLogin;
|
||||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||||
import cn.dev33.satoken.stp.StpUtil;
|
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 cn.hutool.core.util.StrUtil;
|
||||||
import com.budwk.app.base.annotation.SLog;
|
import com.budwk.app.base.annotation.SLog;
|
||||||
import com.budwk.app.base.constant.RoleConstant;
|
import com.budwk.app.base.constant.RoleConstant;
|
||||||
@@ -277,16 +281,25 @@ public class SysUnitController {
|
|||||||
cnd.andEX("id", "=", pid);
|
cnd.andEX("id", "=", pid);
|
||||||
cnd.asc("unitcode");
|
cnd.asc("unitcode");
|
||||||
List<Sys_unit> list = sysUnitService.query(cnd);
|
List<Sys_unit> list = sysUnitService.query(cnd);
|
||||||
NutMap menuMap = NutMap.NEW();
|
|
||||||
for (Sys_unit unit : list) {
|
List<TreeNode<String>> nodeList = CollUtil.newArrayList();
|
||||||
List<Sys_unit> list1 = menuMap.getList(unit.getParentId(), Sys_unit.class);
|
for (int i = 0; i < list.size(); i++) {
|
||||||
if (list1 == null) {
|
nodeList.add(new TreeNode<>(list.get(i).getId(), list.get(i).getParentId(), list.get(i).getName(), i));
|
||||||
list1 = new ArrayList<>();
|
|
||||||
}
|
|
||||||
list1.add(unit);
|
|
||||||
menuMap.put(unit.getParentId(), list1);
|
|
||||||
}
|
}
|
||||||
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) {
|
} catch (Exception e) {
|
||||||
return Result.error();
|
return Result.error();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user