From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index 4f1cad3..dfb15ec 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -186,11 +186,8 @@
* 懒加载获取部门树形结构,不包含顶级管理员公安局
*/
@Override
- public List<DeptVO> securityLazyTree(String tenantId, Long parentId) {
- if (AuthUtil.isAdministrator()) {
- tenantId = StringPool.EMPTY;
- }
- return ForestNodeMerger.merge(baseMapper.securityLazyTree(tenantId, parentId));
+ public List<DeptVO> securityLazyTree(String jurisdiction, Long parentId) {
+ return ForestNodeMerger.merge(baseMapper.securityLazyTree(jurisdiction, parentId));
}
@Override
@@ -204,7 +201,7 @@
}
@Override
- public Map<Object, Object> selectHold(String deptid) {
+ public List<Map<String, Object>> selectHold(String deptid) {
return baseMapper.selectHold(deptid);
}
--
Gitblit v1.9.3