From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001
From: KonBAI <1527468660@qq.com>
Date: 星期六, 02 四月 2022 13:02:56 +0800
Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本，处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java
index 7d25410..f9f8fa1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java
@@ -1,9 +1,11 @@
package com.ruoyi.common.utils;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.lang.tree.TreeNodeConfig;
import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.lang.tree.parser.NodeParser;
+import com.ruoyi.common.utils.reflect.ReflectUtils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -22,13 +24,12 @@
*/
public static final TreeNodeConfig DEFAULT_CONFIG = TreeNodeConfig.DEFAULT_CONFIG.setNameKey("label");
- /**
- * 榛樿鏍戠埗鑺傜偣id
- */
- public static final Long DEFAULT_PARENT_ID = 0L;
-
- public static <T> List<Tree<Long>> build(List<T> list, NodeParser<T, Long> nodeParser) {
- return TreeUtil.build(list, DEFAULT_PARENT_ID, DEFAULT_CONFIG, nodeParser);
+ public static <T, K> List<Tree<K>> build(List<T> list, NodeParser<T, K> nodeParser) {
+ if (CollUtil.isEmpty(list)) {
+ return null;
+ }
+ K k = ReflectUtils.invokeGetter(list.get(0), "parentId");
+ return TreeUtil.build(list, k, DEFAULT_CONFIG, nodeParser);
}
}
--
Gitblit v1.9.3