From 99567ef161981ae01050f652af2a01d679dd0217 Mon Sep 17 00:00:00 2001
From: zhaowenyuan <zhaowenyuan@163.com>
Date: Tue, 18 Jun 2024 16:07:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=89=93=E5=BC=80=20=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E6=B3=A8=E9=87=8A=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/MenuController.java       |  5 ++---
 .../system/service/impl/SysMenuServiceImpl.java | 17 +++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/MenuController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/MenuController.java
index 6db7f22..1076a6d 100644
--- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/MenuController.java
+++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/MenuController.java
@@ -32,12 +32,11 @@ public class MenuController {
     /**
      * 获取菜单列表
      */
-//    @RequiresPermissions("system:menu:list")
+    @RequiresPermissions("system:menu:list")
     @GetMapping("/list")
     public AjaxResult list(ListMenuDTO listMenu)
     {
-//        Long userId = SecurityUtils.getUserId();
-        Long userId = 1L;
+        Long userId = SecurityUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuList(listMenu, userId);
         return AjaxResult.success(menus);
     }
diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysMenuServiceImpl.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysMenuServiceImpl.java
index 733967b..b23ddd7 100644
--- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysMenuServiceImpl.java
+++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysMenuServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chushang.common.core.constant.Constants;
 import com.chushang.common.core.constant.UserConstants;
 import com.chushang.common.core.util.StringUtils;
+import com.chushang.security.utils.SecurityUtils;
 import com.chushang.system.entity.dto.ListMenuDTO;
 import com.chushang.system.entity.enums.MenuTypeEnum;
 import com.chushang.system.entity.po.SysMenu;
@@ -55,15 +56,15 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     @Override
     public List<SysMenu> selectMenuList(ListMenuDTO menu, Long userId) {
         List<SysMenu> menuList;
-//        if (SecurityUtils.isAdmin())
-//        {
+        if (SecurityUtils.isAdmin())
+        {
             menuList = baseMapper.selectMenuList(menu);
-//        }
-//        else
-//        {
-//            menu.getSqlParam().put("userId", userId);
-//            menuList = baseMapper.selectMenuListByUserId(menu);
-//        }
+        }
+        else
+        {
+            menu.getSqlParam().put("userId", userId);
+            menuList = baseMapper.selectMenuListByUserId(menu);
+        }
         return menuList;
     }