From 269031cf8e6d1e4643e1be2b822bbfebcf87ea4b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 16 Jul 2021 22:39:49 +0800
Subject: [PATCH] 考试成绩计算接口新增
---
src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java | 4 ++--
1 files changed, 2 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..bcbf4ab 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
--
Gitblit v1.9.3