From f1092d53966cf3b3b93be7fc59d913cd13d2ec37 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 Aug 2021 16:17:47 +0800
Subject: [PATCH] 1.用户新增角色关联持证字段 2.新增接口，考试开始，修改考试的状态为考试中 3.考试查询接口修改
---
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