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/DeptServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/DeptServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/DeptServiceImpl.java
index 5382e70..b10407e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/DeptServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/DeptServiceImpl.java
@@ -103,11 +103,18 @@
}
@Override
- public List<DeptVO> lazyTree(String tenantId, Long parentId) {
+ public List<DeptVO> lazyTree(String tenantId, String parentIds) {
if (AuthUtil.isAdministrator()) {
tenantId = StringPool.EMPTY;
}
- return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentId));
+
+ String [] parentIdStr = parentIds.split(",");
+ List<Long> parentIdList = new ArrayList<>();
+ for (String str:parentIdStr) {
+ parentIdList.add(Long.parseLong(str));
+ }
+
+ return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentIdList));
}
@Override
--
Gitblit v1.9.3