From 140be610032a7b92ac0a7627d10353dca81ac608 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 08 二月 2020 14:49:46 +0800
Subject: [PATCH] 根据用户权限加载菜单数据树形结构
---
ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml | 16 ++++++++++++++++
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java | 15 +++++++++++++--
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java | 8 ++++++++
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysMenuService.java | 5 +++--
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java | 16 +++++++++++++---
5 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
index 47634f5..1e6ce5e 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
@@ -14,8 +14,11 @@
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.security.service.TokenService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysMenu;
@@ -33,6 +36,9 @@
@Autowired
private ISysMenuService menuService;
+ @Autowired
+ private TokenService tokenService;
+
/**
* 鑾峰彇鑿滃崟鍒楄〃
*/
@@ -40,7 +46,9 @@
@GetMapping("/list")
public AjaxResult list(SysMenu menu)
{
- List<SysMenu> menus = menuService.selectMenuList(menu);
+ LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+ Long userId = loginUser.getUser().getUserId();
+ List<SysMenu> menus = menuService.selectMenuList(menu, userId);
return AjaxResult.success(menuService.buildMenuTree(menus));
}
@@ -58,9 +66,11 @@
* 鑾峰彇鑿滃崟涓嬫媺鏍戝垪琛�
*/
@GetMapping("/treeselect")
- public AjaxResult treeselect(SysMenu dept)
+ public AjaxResult treeselect(SysMenu menu)
{
- List<SysMenu> menus = menuService.selectMenuList(dept);
+ LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+ Long userId = loginUser.getUser().getUserId();
+ List<SysMenu> menus = menuService.selectMenuList(menu, userId);
return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java
index d52a087..fc46085 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java
@@ -27,6 +27,14 @@
public List<String> selectMenuPerms();
/**
+ * 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃
+ *
+ * @param menu 鑿滃崟淇℃伅
+ * @return 鑿滃崟鍒楄〃
+ */
+ public List<SysMenu> selectMenuListByUserId(SysMenu menu);
+
+ /**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺
*
* @param userId 鐢ㄦ埛ID
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysMenuService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysMenuService.java
index 8460554..cb4d7b7 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysMenuService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysMenuService.java
@@ -14,12 +14,13 @@
public interface ISysMenuService
{
/**
- * 鏌ヨ绯荤粺鑿滃崟鍒楄〃
+ * 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃
*
* @param menu 鑿滃崟淇℃伅
+ * @param userId 鐢ㄦ埛ID
* @return 鑿滃崟鍒楄〃
*/
- public List<SysMenu> selectMenuList(SysMenu menu);
+ public List<SysMenu> selectMenuList(SysMenu menu, Long userId);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
index 2b19546..b8d8603 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
@@ -15,6 +15,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.TreeSelect;
import com.ruoyi.project.system.domain.SysMenu;
+import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.domain.vo.MetaVo;
import com.ruoyi.project.system.domain.vo.RouterVo;
import com.ruoyi.project.system.mapper.SysMenuMapper;
@@ -44,9 +45,19 @@
* @return 鑿滃崟鍒楄〃
*/
@Override
- public List<SysMenu> selectMenuList(SysMenu menu)
+ public List<SysMenu> selectMenuList(SysMenu menu, Long userId)
{
- List<SysMenu> menuList = menuMapper.selectMenuList(menu);
+ List<SysMenu> menuList = null;
+ // 绠＄悊鍛樻樉绀烘墍鏈夎彍鍗曚俊鎭�
+ if (SysUser.isAdmin(userId))
+ {
+ menuList = menuMapper.selectMenuList(menu);
+ }
+ else
+ {
+ menu.getParams().put("userId", userId);
+ menuList = menuMapper.selectMenuListByUserId(menu);
+ }
return menuList;
}
diff --git a/ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
index d233602..98aee20 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
@@ -47,6 +47,22 @@
from sys_menu m where m.menu_type in ('M', 'C') and m.visible = 0
order by m.parent_id, m.order_num
</select>
+
+ <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
+ select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, ifnull(m.perms,'') as perms, m.is_frame, m.menu_type, m.icon, m.order_num, m.create_time
+ from sys_menu m
+ left join sys_role_menu rm on m.menu_id = rm.menu_id
+ left join sys_user_role ur on rm.role_id = ur.role_id
+ left join sys_role ro on ur.role_id = ro.role_id
+ where ur.user_id = #{params.userId}
+ <if test="menuName != null and menuName != ''">
+ AND menu_name like concat('%', #{menuName}, '%')
+ </if>
+ <if test="visible != null and visible != ''">
+ AND visible = #{visible}
+ </if>
+ order by m.parent_id, m.order_num
+ </select>
<select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, ifnull(m.perms,'') as perms, m.is_frame, m.menu_type, m.icon, m.order_num, m.create_time
--
Gitblit v1.9.3