Merge branch 'master' into master-任务组

陈昶聿

20 小时以前 6e3d0a2097a4d841e941a84ec54780a67eb60ba1

 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 {