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 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 impl @Override public List selectMenuList(ListMenuDTO menu, Long userId) { List 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; }