no message

src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -342,8 +342,8 @@ public class AdminUserLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
         Set<String> adminUserIdList = new HashSet<>();
-        if (!adminUser.getType().equals(0)) {
-            // 非平台账号，筛选能看的账号
+        if (!adminUser.getUserName().equals("admin")) {
+            // 非admin，筛选能看的账号
             this.queryCanSeeAdminUser(adminUserIdList, adminUser);
             adminUserIdList.add(adminUser.getAdminUserId());
         }
@@ -353,7 +353,15 @@ public class AdminUserLogic {
                 .ne(!adminUser.getUserName().equals("admin"), AdminUser::getUserName, "admin")
                 .eq(StringUtils.isNotEmpty(roleId), AdminUser::getRoleId, roleId)
                 .eq(status != null, AdminUser::getStatus, status)
-                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()), AdminUser::getCompanyId, adminUser.getAdminCompanyIds())
+                .and(v -> {
+                    if (!adminUser.getUserName().equals("admin") && adminUser.getType().equals(0)) {
+                        v.in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()), AdminUser::getCompanyId, adminUser.getAdminCompanyIds())
+                                .or()
+                                .isNull(AdminUser::getCompanyId);
+                    } else {
+                        v.in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()), AdminUser::getCompanyId, adminUser.getAdminCompanyIds());
+                    }
+                })
                 .like(StringUtils.isNotEmpty(userName), AdminUser::getUserName, userName)
                 .page(new Page<>(pageNum, pageSize));
         return page;