Merge remote-tracking branch 'origin/master'

feige

2025-06-23 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2

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

@@ -74,11 +74,11 @@
    {
        List<SysMenu> menuList = null;
        // 管理员显示所有菜单信息
        if (SysUser.isAdmin(userId))
        {
            menuList = menuMapper.selectMenuList(menu);
        }
        else
//        if (SysUser.isAdmin(userId))
//        {
//            menuList = menuMapper.selectMenuList(menu);
//        }
//        else
        {
            menu.getParams().put("userId", userId);
            menuList = menuMapper.selectMenuListByUserId(menu);