From 1ae132711061edcdc190edfca383612bd13e1688 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Feb 2024 15:11:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 2 +-
2 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 8070d36..bdacb04 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
@@ -118,7 +118,7 @@
// 新增配置
roleMenuService.saveBatch(roleMenus);
// 递归设置下属角色菜单集合
- recursionRoleMenu(roleIds, menuIds);
+// recursionRoleMenu(roleIds, menuIds);
return true;
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 1601e19..d25cb7e 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -213,7 +213,7 @@
@Override
public IPage<User> selectUserPage(IPage<User> page, User user, String deptId, String tenantId) {
- if (null == deptId && !AuthUtil.isAdministrator()) {
+ if (Strings.isBlank(deptId) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) {
deptId = AuthUtil.getDeptId();
}
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
--
Gitblit v1.9.3