merge changes from master
This commit is contained in:
commit
4f1d1b89f4
|
@ -1,7 +1,6 @@
|
|||
package eu.dnetlib.uoamonitorservice.controllers;
|
||||
|
||||
import eu.dnetlib.uoaadmintoolslibrary.entities.Portal;
|
||||
import eu.dnetlib.uoaadmintoolslibrary.handlers.ForbiddenException;
|
||||
import eu.dnetlib.uoaadmintoolslibrary.services.PortalService;
|
||||
import eu.dnetlib.uoamonitorservice.dto.BuildStakeholder;
|
||||
import eu.dnetlib.uoamonitorservice.dto.ManageStakeholders;
|
||||
|
|
|
@ -84,7 +84,6 @@ public class StakeholderService {
|
|||
}
|
||||
|
||||
public StakeholderFull getFullStakeholder(Stakeholder stakeholder) {
|
||||
if (this.commonService.hasVisibilityAuthority(stakeholder.getType(), stakeholder.getAlias(), stakeholder)) {
|
||||
List<TopicFull> topics = stakeholder.getTopics().stream()
|
||||
.map(topicId -> topicService.getFullTopic(stakeholder.getType(), stakeholder.getAlias(), topicId))
|
||||
.collect(Collectors.toList());
|
||||
|
@ -98,9 +97,6 @@ public class StakeholderService {
|
|||
}
|
||||
Umbrella<Stakeholder> umbrella = Umbrella.convert(stakeholder.getUmbrella(), this);
|
||||
return new StakeholderFull(stakeholder, topics, umbrella);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private List<Stakeholder> getOtherParents(String parent, String type, String id) {
|
||||
|
|
Loading…
Reference in New Issue