From bc74ffaaa0074a96d7e7e60838845d020f94f347 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 27 十月 2024 21:16:05 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
index 9a1f935..51d9e65 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
@@ -3,6 +3,9 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+
+import com.ruoyi.domain.ZfAncestor;
+import com.ruoyi.service.ZfAncestorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ruoyi.common.core.domain.entity.SysRole;
@@ -24,6 +27,9 @@
@Autowired
private ISysMenuService menuService;
+ @Autowired
+ private ZfAncestorService zfService;
+
/**
* 鑾峰彇瑙掕壊鏁版嵁鏉冮檺
*
@@ -33,6 +39,7 @@
public Set<String> getRolePermission(SysUser user)
{
Set<String> roles = new HashSet<String>();
+
// 绠＄悊鍛樻嫢鏈夋墍鏈夋潈闄�
if (user.isAdmin())
{
@@ -55,10 +62,16 @@
{
Set<String> perms = new HashSet<String>();
// 绠＄悊鍛樻嫢鏈夋墍鏈夋潈闄�
- if (user.isAdmin())
+ ZfAncestor zfAncestor = new ZfAncestor();
+ zfAncestor.setSysId(user.getUserId());
+ zfAncestor = zfService.selectZfAncestor(zfAncestor);
+// System.out.println("---------++++++++____________");
+// System.out.println(zfAncestor);
+// //鍒ゆ柇鏄惁鏄秴绾х鐞嗗憳
+ if(zfAncestor!=null)
{
- // perms.add("system:*:*");
- perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
+ perms.add("*:*:*");
+ // perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
}
else
--
Gitblit v1.9.1