ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
@@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.mapper.BaseMapperPlus; @@ -25,10 +27,10 @@ /** * 根据用户查询系统菜单列表 * * @param menu 菜单信息 * @param queryWrapper 查询条件 * @return 菜单列表 */ List<SysMenu> selectMenuListByUserId(SysMenu menu); List<SysMenu> selectMenuListByUserId(@Param(Constants.WRAPPER) Wrapper<SysMenu> queryWrapper); /** * 根据用户ID查询权限 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -4,6 +4,8 @@ import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.entity.SysMenu; @@ -65,8 +67,14 @@ .orderByAsc(SysMenu::getParentId) .orderByAsc(SysMenu::getOrderNum)); } else { menu.getParams().put("userId", userId); menuList = baseMapper.selectMenuListByUserId(menu); QueryWrapper<SysMenu> wrapper = Wrappers.query(); wrapper.eq("ur.user_id", userId) .like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName()) .eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible()) .eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus()) .orderByAsc("m.parent_id") .orderByAsc("m.order_num"); menuList = baseMapper.selectMenuListByUserId(wrapper); } return menuList; } ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -34,17 +34,7 @@ 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 m.menu_name like concat('%', #{menuName}, '%') </if> <if test="visible != null and visible != ''"> AND m.visible = #{visible} </if> <if test="status != null and status != ''"> AND m.status = #{status} </if> order by m.parent_id, m.order_num ${ew.getCustomSqlSegment} </select> <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">