From 76a2e7f8e5978e9ee13d7401c7153820b309cd6d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 28 九月 2021 09:46:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java
index d8c657b..095b3b5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java
@@ -2,19 +2,19 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
import java.util.HashSet;
import java.util.Set;
/**
* 鐢ㄦ埛鏉冮檺澶勭悊
- *
+ *
* @author ruoyi
*/
-@Component
-public class SysPermissionService
-{
+@Service
+public class SysPermissionService {
+
@Autowired
private ISysRoleService roleService;
@@ -23,20 +23,16 @@
/**
* 鑾峰彇瑙掕壊鏁版嵁鏉冮檺
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 瑙掕壊鏉冮檺淇℃伅
*/
- public Set<String> getRolePermission(SysUser user)
- {
+ public Set<String> getRolePermission(SysUser user) {
Set<String> roles = new HashSet<String>();
// 绠＄悊鍛樻嫢鏈夋墍鏈夋潈闄�
- if (user.isAdmin())
- {
+ if (user.isAdmin()) {
roles.add("admin");
- }
- else
- {
+ } else {
roles.addAll(roleService.selectRolePermissionByUserId(user.getUserId()));
}
return roles;
@@ -44,20 +40,16 @@
/**
* 鑾峰彇鑿滃崟鏁版嵁鏉冮檺
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 鑿滃崟鏉冮檺淇℃伅
*/
- public Set<String> getMenuPermission(SysUser user)
- {
+ public Set<String> getMenuPermission(SysUser user) {
Set<String> perms = new HashSet<String>();
// 绠＄悊鍛樻嫢鏈夋墍鏈夋潈闄�
- if (user.isAdmin())
- {
+ if (user.isAdmin()) {
perms.add("*:*:*");
- }
- else
- {
+ } else {
perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
}
return perms;
--
Gitblit v1.9.3