From 7507a3ed2a4570ca510403c48f406942556382a8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 09 三月 2020 09:40:39 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
index dfa26e2..20a2a0b 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
@@ -51,16 +51,16 @@
*/
public Set<String> getMenuPermission(SysUser user)
{
- Set<String> roles = new HashSet<String>();
+ Set<String> perms = new HashSet<String>();
// 绠＄悊鍛樻嫢鏈夋墍鏈夋潈闄�
if (user.isAdmin())
{
- roles.add("*:*:*");
+ perms.add("*:*:*");
}
else
{
- roles.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
+ perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
}
- return roles;
+ return perms;
}
}
--
Gitblit v1.9.3