From 19f40c8e0649ae81b3f0183a6f4c8aa6c3db39bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 18 Nov 2021 17:54:37 +0800
Subject: [PATCH] 证书打印信息导出修改,已过考试的，系统每天凌晨1点定时清理，标记为缺考，并生成缺考记录，保安员导入新增年龄判断，超过60岁的不能导入
---
src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 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..847aafb 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)) {
@@ -214,4 +219,9 @@
return RoleWrapper.build().listNodeVO(roleList);
}
+ @Override
+ public List selectRole() {
+ return baseMapper.selectRole();
+ }
+
}
--
Gitblit v1.9.3