|
|
@@ -1,11 +1,11 @@
|
|
|
package org.dromara.system.service.impl;
|
|
|
|
|
|
+import lombok.RequiredArgsConstructor;
|
|
|
import org.dromara.common.core.constant.TenantConstants;
|
|
|
import org.dromara.common.satoken.utils.LoginHelper;
|
|
|
import org.dromara.system.service.ISysMenuService;
|
|
|
import org.dromara.system.service.ISysPermissionService;
|
|
|
import org.dromara.system.service.ISysRoleService;
|
|
|
-import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.HashSet;
|
|
|
@@ -36,7 +36,11 @@ public class SysPermissionServiceImpl implements ISysPermissionService {
|
|
|
if (LoginHelper.isSuperAdmin(userId)) {
|
|
|
roles.add(TenantConstants.SUPER_ADMIN_ROLE_KEY);
|
|
|
} else {
|
|
|
- roles.addAll(roleService.selectRolePermissionByUserId(userId));
|
|
|
+ if (roleService.checkSuperAdminByUserId(userId)) {
|
|
|
+ roles.add(TenantConstants.SUPER_ADMIN_ROLE_KEY);
|
|
|
+ }else {
|
|
|
+ roles.addAll(roleService.selectRolePermissionByUserId(userId));
|
|
|
+ }
|
|
|
}
|
|
|
return roles;
|
|
|
}
|
|
|
@@ -54,7 +58,11 @@ public class SysPermissionServiceImpl implements ISysPermissionService {
|
|
|
if (LoginHelper.isSuperAdmin(userId)) {
|
|
|
perms.add("*:*:*");
|
|
|
} else {
|
|
|
- perms.addAll(menuService.selectMenuPermsByUserId(userId));
|
|
|
+ if (roleService.checkSuperAdminByUserId(userId)) {
|
|
|
+ perms.add("*:*:*");
|
|
|
+ } else {
|
|
|
+ perms.addAll(menuService.selectMenuPermsByUserId(userId));
|
|
|
+ }
|
|
|
}
|
|
|
return perms;
|
|
|
}
|