‘linchangsheng’ преди 7 месеца
родител
ревизия
943dd24b8c
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -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());