From 8018e564729067b0b61a5c992b5667dbcad39c70 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Fri, 13 Sep 2024 23:12:15 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/DeptServiceImpl.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 b10407e..46be4eb 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
@@ -248,4 +248,17 @@
public String getResDept(String deptIds) {
return baseMapper.getResDept(deptIds);
}
+
+ @Override
+ public List<DeptVO> treeByParentIdNew(String parentId,String precinct) {
+// if (AuthUtil.isAdministrator() || AuthUtil.isAdmin()) {
+// return ForestNodeMerger.merge(baseMapper.tree(StringPool.EMPTY));
+// }
+ String [] parentIds = parentId.split(",");
+ List<String> parentIdList = new ArrayList<>();
+ for (String str:parentIds) {
+ parentIdList.add(str);
+ }
+ return ForestNodeMerger.merge(baseMapper.treeByParentIdNew(parentIdList,precinct));
+ }
}
--
Gitblit v1.9.3