From eb286b8d88dc5fcd0290d0d243cb7f0a2448616f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 31 十月 2024 22:24:29 +0800
Subject: [PATCH] 8.9
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
index 9c01949..7f8182c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.service.impl;
+import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysPermissionService;
@@ -30,15 +31,8 @@
* @return 角色权限信息
*/
@Override
- public String getRolePermission(SysUser user) {
- String roles;
- // 管理员拥有所有权限
- if (user.isAdmin()) {
- roles = "admin";
- } else {
- roles = roleService.selectRolePermissionByUserId(user.getUserId());
- }
- return roles;
+ public SysRole getRolePermission(SysUser user) {
+ return roleService.selectRolePermissionByUserId(user.getUserId());
}
/**
@@ -50,18 +44,13 @@
@Override
public Set<String> getMenuPermission(SysUser user) {
Set<String> perms = new HashSet<String>();
- // 管理员拥有所有权限
- if (user.isAdmin()) {
- perms.add("*:*:*");
+ Long roleId = user.getRoleId();
+ if (null == roleId) {
+ perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
} else {
- Long roleId = user.getSysRole().getRoleId();
- if (null == roleId) {
- perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
- } else {
- // 多角色设置permissions属性，以便数据权限匹配权限
- Set<String> rolePerms = menuService.selectMenuPermsByRoleId(roleId);
- perms.addAll(rolePerms);
- }
+ // 多角色设置permissions属性，以便数据权限匹配权限
+ Set<String> rolePerms = menuService.selectMenuPermsByRoleId(roleId);
+ perms.addAll(rolePerms);
}
return perms;
}
--
Gitblit v1.7.1