| | |
| | | } |
| | | List<RoleVO> merge = ForestNodeMerger.merge(baseMapper.tree(tenantId, excludeRole)); |
| | | List<RoleVO> copy = BeanUtil.copy(merge, RoleVO.class); |
| | | if (!AuthUtil.isAdministrator()) { |
| | | if (!AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) { |
| | | List<RoleVO> collect = copy.stream().filter(item -> roleId.contains(item.getId().toString())).collect(Collectors.toList()); |
| | | return collect; |
| | | } |
| | |
| | | // 新增配置 |
| | | roleMenuService.saveBatch(roleMenus); |
| | | // 递归设置下属角色菜单集合 |
| | | recursionRoleMenu(roleIds, menuIds); |
| | | // recursionRoleMenu(roleIds, menuIds); |
| | | return true; |
| | | } |
| | | |