浏览代码

修改菜单查询

bihuisong 2 月之前
父节点
当前提交
1b9f442afc

+ 11 - 1
src/main/java/com/ruoyi/system/service/impl/SysMenuAppServiceImpl.java

@@ -92,7 +92,17 @@ public class SysMenuAppServiceImpl implements ISysMenuAppService
     @Override
     public List<SysMenuApp> selectMenuList(SysMenuApp menu, Long userId)
     {
-        List<SysMenuApp> menuList = sysMenuAppMapper.selectMenuList(menu);
+        List<SysMenuApp> menuList = null;
+        // 管理员显示所有菜单信息
+        if (SysUser.isAdmin(userId))
+        {
+            menuList = sysMenuAppMapper.selectMenuList(menu);
+        }
+        else
+        {
+            menu.setStatus("0");
+            menuList = sysMenuAppMapper.selectMenuList(menu);
+        }
         return menuList;
     }
 

+ 1 - 1
src/main/resources/mapper/system/SysMenuAppMapper.xml

@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_role_menuapp 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}
+        where m.status = 0 and ur.user_id = #{params.userId}
         <if test="menuName != null and menuName != ''">
             AND m.menu_name like concat('%', #{menuName}, '%')
         </if>

+ 1 - 1
src/main/resources/mapper/system/SysMenuVisuMapper.xml

@@ -194,7 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_role_menuvisu 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}
+        where m.status = 0 and ur.user_id = #{params.userId}
         <if test="menuName != null and menuName != ''">
             AND m.menu_name like concat('%', #{menuName}, '%')
         </if>