From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改
---
src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java
index 8391280..f4a408b 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java
@@ -69,13 +69,13 @@
}
@Override
- public List<RoleVO> tree(String tenantId) {
+ public List<RoleVO> tree(String tenantId,Long deptId) {
String userRole = AuthUtil.getUserRole();
String excludeRole = null;
if (!CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMIN) && !CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMINISTRATOR)) {
excludeRole = RoleConstant.ADMIN;
}
- return ForestNodeMerger.merge(baseMapper.tree(tenantId, excludeRole));
+ return ForestNodeMerger.merge(baseMapper.tree(tenantId,deptId, excludeRole));
}
@Override
@@ -202,6 +202,11 @@
}
@Override
+ public String Info(String id) {
+ return baseMapper.Info(id);
+ }
+
+ @Override
public List<RoleVO> search(String roleName, Long parentId) {
LambdaQueryWrapper<Role> queryWrapper = Wrappers.<Role>query().lambda();
if (Func.isNotEmpty(roleName)) {
--
Gitblit v1.9.3