From 19df67e19f23cd2a04d1c7f355e1e656f4140af4 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 17 四月 2025 20:04:14 +0800
Subject: [PATCH] 后台:首页统计、系统管理、广告管理、用户管理、商品分类管理

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 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 0a926ba..3e06f28 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
@@ -65,15 +65,15 @@
     public Set<String> getMenuPermission(SysUser user)
     {
         Set<String> perms = new HashSet<String>();
-        List<UserShop> userShop = userShopService.getUserShop(user.getUserId(), 1);
+        List<UserShop> userShop = userShopService.getUserShop(user.getUserId(), 1);//获取门店
         // 管理员拥有所有权限
         if (user.isAdmin())
         {
             perms.add("*:*:*");
-        }else if(user.getRoleType() == 2 && null != userShop && userShop.size() > 0){
+        }/*else if(user.getRoleType() == 2 && null != userShop && userShop.size() > 0){//门店
             List<SysMenu> list = menuService.getAllMenu(2);
             return list.stream().map(SysMenu::getPath).collect(Collectors.toSet());
-        }
+        }*/
         else
         {
             List<SysRole> roles = user.getRoles();
@@ -88,13 +88,14 @@
                 }
             }
             else
-            {
-                if(user.getRoleType() == 1){
+            {//没有角色
+                perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
+                /*if(user.getRoleType() == 1){
                     perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
                 }else{
                     UserShop one = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, user.getUserId()).eq(UserShop::getShopId, user.getObjectId()));
                     perms.addAll(menuService.selectMenuPermsByRoleId(one.getRoleId()));
-                }
+                }*/
             }
         }
         return perms;

--
Gitblit v1.7.1