Browse Source

调整菜单权限没有system_Type查询参数

zjc 1 year ago
parent
commit
aa0890586b

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -93,10 +93,10 @@ public class SysLoginController
      * @return 路由信息
      */
     @GetMapping("getRouters")
-    public AjaxResult getRouters(String systemType)
+    public AjaxResult getRouters()
     {
         Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId,systemType);
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));
     }
 

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -63,7 +63,7 @@ public interface SysMenuMapper
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(@Param("userId")Long userId,@Param("systemType")String systemType);
+    public List<SysMenu> selectMenuTreeByUserId(@Param("userId")Long userId);
 
     /**
      * 根据角色ID查询菜单树信息

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java

@@ -53,7 +53,7 @@ public interface ISysMenuService
      * @param menuType 菜单类型
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId,String menuType);
+    public List<SysMenu> selectMenuTreeByUserId(Long userId);
 
     /**
      * 根据角色ID查询菜单树信息

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -132,7 +132,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuTreeByUserId(Long userId,String systemType)
+    public List<SysMenu> selectMenuTreeByUserId(Long userId)
     {
         List<SysMenu> menus = null;
         if (SecurityUtils.isAdmin(userId))
@@ -141,7 +141,7 @@ public class SysMenuServiceImpl implements ISysMenuService
         }
         else
         {
-            menus = menuMapper.selectMenuTreeByUserId(userId,systemType);
+            menus = menuMapper.selectMenuTreeByUserId(userId);
         }
         return getChildPerms(menus, 0);
     }

+ 0 - 3
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -82,9 +82,6 @@
 			 left join sys_role ro on ur.role_id = ro.role_id
 			 left join sys_user u on ur.user_id = u.user_id
 		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
-		<if test="systemType != null and systemType != ''">
-			AND m.system_type = #{systemType}
-		</if>
 		order by m.parent_id, m.order_num
 	</select>