no message

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

@@ -103,9 +103,15 @@ public class AdminWebsitLogic {
     public List<AdminWebsitTree> tree(HttpServletRequest request) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
-        List<AdminWebsit> list = adminWebsitService.lambdaQuery()
-                .and(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()), v -> v.in(AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatIds()))
-                .list();
+        boolean isAdmin = adminUser.getType().equals(2) && adminUser.getUserName().equals("admin");
+        List<AdminWebsit> list;
+        if (isAdmin) {
+            list = adminWebsitService.lambdaQuery().list();
+        } else {
+            list = adminWebsitService.lambdaQuery()
+                    .and(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()), v -> v.in(AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatIds()))
+                    .list();
+        }
         List<AdminWebsitTree> trees = new ArrayList<>();
         for (AdminWebsit adminWebsit : list) {
             AdminWebsitTree adminWebsitTree = new AdminWebsitTree();
@@ -116,11 +122,11 @@ public class AdminWebsitLogic {
                 .eq(AdminUserWebsitRela::getAdminUserId, adminUser.getAdminUserId()).last("limit 1").one();
 
         List<AdminWebsitTree> parentList = trees.stream()
-                .filter(x -> (CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) && x.getParentId().equals("0")) ||
-                        (!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) && adminUser.getAdminWebsitIds().contains(x.getWebsitId())
-
-                        ))
+                .filter(x -> (CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) && x.getParentId().equals("0"))
+                        || isAdmin
+                        || (!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());
         }