|
@@ -99,8 +99,8 @@ public class AdminWebsitLogic {
|
|
|
.eq(AdminUserWebsitRela::getAdminUserId, adminUser.getAdminUserId()).last("limit 1").one();
|
|
|
|
|
|
List<AdminWebsitTree> parentList = trees.stream()
|
|
|
- .filter(x -> (one == null && x.getParentId().equals("0")) ||
|
|
|
- (one != null && x.getWebsitId().equals(one.getAdminWebsitId())))
|
|
|
+ .filter(x -> (CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) && x.getParentId().equals("0")) ||
|
|
|
+ (!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) && adminUser.getAdminWebsitIds().contains(x.getWebsitId())))
|
|
|
.collect(Collectors.toList());
|
|
|
if (CollectionUtils.isEmpty(parentList)) {
|
|
|
parentList = trees.stream().filter(x -> x.getParentId().equals("0")).collect(Collectors.toList());
|