From c0e0761eec99d3642b6a1acdcdb5e2b51a481aaf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 11 Dec 2024 20:49:28 +0800
Subject: [PATCH] 权限配置
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/DeptServiceImpl.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 a0649de..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
@@ -38,6 +38,7 @@
import cn.gistack.system.wrapper.DeptWrapper;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -93,15 +94,27 @@
if (AuthUtil.isAdministrator() || AuthUtil.isAdmin()) {
return ForestNodeMerger.merge(baseMapper.tree(StringPool.EMPTY));
}
- return ForestNodeMerger.merge(baseMapper.treeByParentId(parentId));
+ String [] parentIds = parentId.split(",");
+ List<String> parentIdList = new ArrayList<>();
+ for (String str:parentIds) {
+ parentIdList.add(str);
+ }
+ return ForestNodeMerger.merge(baseMapper.treeByParentId(parentIdList));
}
@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
@@ -235,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