From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java
index a0e43a6..b9705ad 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java
@@ -84,7 +84,12 @@
if (AuthUtil.isAdministrator() || AuthUtil.isAdmin()) {
return ForestNodeMerger.merge(baseMapper.tree(null, RoleConstant.ADMINISTRATOR));
}
- return ForestNodeMerger.merge(baseMapper.treeByParentId(parentId));
+ return ForestNodeMerger.merge(baseMapper.treeByParentId(parentId.split(",")));
+ }
+ @Override
+ public List<RoleVO> treeByParentIdNew(String parentId) {
+
+ return ForestNodeMerger.merge(baseMapper.treeByParentIdNew(parentId.split(",")));
}
@Override
--
Gitblit v1.9.3