|
|
@@ -84,21 +84,6 @@ public class CurrentUserService {
|
|
|
}else {
|
|
|
tenantMenus=roleMenus;
|
|
|
}
|
|
|
-
|
|
|
-// //当未传门户id时,使用默认门户
|
|
|
-// if(StrUtil.isEmpty(portalId)){
|
|
|
-// List<SysUserPortalListDTO> portalList = currentUserPortals();
|
|
|
-// if (CollectionUtil.isNotEmpty(portalList)) {
|
|
|
-// portalId=portalList.stream()
|
|
|
-// .filter(portal->Boolean.TRUE.equals(portal.getIsDefault()))
|
|
|
-// .map(SysUserPortalListDTO::getId)
|
|
|
-// .findFirst()
|
|
|
-// .orElse(CollectionUtil.getFirst(portalList).getId());
|
|
|
-// }
|
|
|
-// }
|
|
|
-// Set<SysMenuDTO> portalMenus =StrUtil.isEmpty(portalId)?Collections.emptySet():new HashSet<>(portalMenuService.findAllMenusByPortalId(portalId));
|
|
|
- // 交集（门面菜单，租户菜单，角色菜单）
|
|
|
-// Collection<SysMenuDTO> allMenus = CollectionUtil.intersection(tenantMenus, roleMenus,portalMenus);
|
|
|
Collection<SysMenuDTO> allMenus = CollectionUtil.intersection(tenantMenus, roleMenus);
|
|
|
if(CollectionUtil.isEmpty(allMenus)){
|
|
|
return new ArrayList<>();
|
