Browse Source

no message

FengChaoYu 1 month ago
parent
commit
de9071dc6f
1 changed files with 12 additions and 5 deletions
  1. 12 5
      src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

+ 12 - 5
src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -409,11 +409,14 @@ public class AdminUserLogic {
         }
 
         // 根据商家id集合查找有关联的账号
-        List<AdminUserPermissionsRela> adminUserPermissionsRelaList = adminUserPermissionsRelaService.lambdaQuery()
-                .select(AdminUserPermissionsRela::getAdminUserId)
-                .in(AdminUserPermissionsRela::getAdminUserPermissionsId, websitIdList)
-                .groupBy(AdminUserPermissionsRela::getAdminUserId)
-                .list();
+        List<AdminUserPermissionsRela> adminUserPermissionsRelaList = null;
+        if (CollectionUtil.isNotEmpty(websitIdList)) {
+            adminUserPermissionsRelaList = adminUserPermissionsRelaService.lambdaQuery()
+                    .select(AdminUserPermissionsRela::getAdminUserId)
+                    .in(AdminUserPermissionsRela::getAdminUserPermissionsId, websitIdList)
+                    .groupBy(AdminUserPermissionsRela::getAdminUserId)
+                    .list();
+        }
 
         if (CollectionUtil.isNotEmpty(deptIdList)) {
             final List<AdminUserPermissionsRela> relaDeptList = adminUserPermissionsRelaService.lambdaQuery()
@@ -424,6 +427,10 @@ public class AdminUserLogic {
             adminUserPermissionsRelaList.addAll(relaDeptList);
         }
 
+        if (CollectionUtil.isEmpty(adminUserPermissionsRelaList)) {
+            return;
+        }
+
         List<String> queryAdminUserIdList = adminUserPermissionsRelaList.stream()
                 .map(AdminUserPermissionsRela::getAdminUserId)
                 .distinct()