Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 fb9c56894fcee50e17f47253728a4ef0f16a1e0a

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

@@ -73,6 +73,8 @@
        List<SysMenu> menuList = null;
        // 管理员显示所有菜单信息
//        if (SysUser.isAdmin(userId)) {
        //menu 不限制 orgid，orgid都为空
        menu.setOrgid(null);
            if (userId != null && isAdmin.contains(userId)) {
                menuList = menuMapper.selectMenuList(menu);
            } else {