From 5e2ebcceae4bc34b46370f2c10110cd72e7f4fba Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 22 八月 2024 10:59:29 +0800
Subject: [PATCH] 修改权限相关

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index be7a146..ce6f04a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -8,6 +8,9 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+
+import com.ruoyi.domain.ZfAncestor;
+import com.ruoyi.service.ZfAncestorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.constant.Constants;
@@ -43,6 +46,10 @@
 
     @Autowired
     private SysRoleMenuMapper roleMenuMapper;
+
+
+    @Autowired
+    private ZfAncestorService zfService;
 
     /**
      * 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃
@@ -131,9 +138,20 @@
     public List<SysMenu> selectMenuTreeByUserId(Long userId)
     {
         List<SysMenu> menus = null;
-        if (SecurityUtils.isAdmin(userId))
+        ZfAncestor zfAncestor = new ZfAncestor();
+        zfAncestor.setSysId(userId);
+        zfAncestor = zfService.selectZfAncestor(zfAncestor);
+        System.out.println("---------++++++++____________");
+        System.out.println(zfAncestor);
+        //鍒ゆ柇鏄惁鏄秴绾х鐞嗗憳
+        if(zfAncestor!=null && zfAncestor.getId()==1L && zfAncestor.getRoleId()==0L)
         {
-            //濡傛灉鏄秴绾х鐞嗗憳锛屾妸宸︿晶鎵�鏈夌殑鐩綍鍜岃彍鍗曢兘鏌ュ嚭鏉�
+            menus = menuMapper.selectMenuTreeAllSuperAdmin();
+
+        }
+        else if(zfAncestor!=null && zfAncestor.getRoleId()==2)
+        {
+            //濡傛灉鏄櫘閫氱鐞嗗憳锛屾妸鏅�氱鐞嗗憳鐨勮彍鍗曟樉绀哄嚭鏉�
             menus = menuMapper.selectMenuTreeAll();
         }
         else

--
Gitblit v1.9.1