Merge branch 'feature/SUPPORT-9356_fix_domain_load' into develop
This commit is contained in:
commit
44681d41d3
1 changed files with 5 additions and 0 deletions
|
|
@ -65,6 +65,11 @@ public class TreeItemService {
|
||||||
.filter(item -> item.domainId.equalsIgnoreCase(domainId))
|
.filter(item -> item.domainId.equalsIgnoreCase(domainId))
|
||||||
.toList();
|
.toList();
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
filteredTreeItems = filteredTreeItems.stream()
|
||||||
|
.filter(item -> item.parentId == null)
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
filteredTreeItems.forEach(this::setDomainIdToNull);
|
filteredTreeItems.forEach(this::setDomainIdToNull);
|
||||||
return filteredTreeItems;
|
return filteredTreeItems;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue