浏览代码

no message

FengChaoYu 1 月之前
父节点
当前提交
e3fc440d9e
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

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

@@ -356,7 +356,7 @@ public class AdminUserLogic {
                 .ne(!adminUser.getUserName().equals("admin"), AdminUser::getUserName, "admin")
                 .ne(!adminUser.getUserName().equals("admin"), AdminUser::getUserName, "admin")
                 .eq(StringUtils.isNotEmpty(roleId), AdminUser::getRoleId, roleId)
                 .eq(StringUtils.isNotEmpty(roleId), AdminUser::getRoleId, roleId)
                 .eq(status != null, AdminUser::getStatus, status)
                 .eq(status != null, AdminUser::getStatus, status)
-                .and(v -> {
+                .and(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()), v -> {
                     if (!adminUser.getUserName().equals("admin") && adminUser.getType().equals(0)) {
                     if (!adminUser.getUserName().equals("admin") && adminUser.getType().equals(0)) {
                         v.in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()), AdminUser::getCompanyId, adminUser.getAdminCompanyIds())
                         v.in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()), AdminUser::getCompanyId, adminUser.getAdminCompanyIds())
                                 .or()
                                 .or()