Browse Source

no message

FengChaoYu 1 tháng trước cách đây
mục cha
commit
5b30eb51b2

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

@@ -50,7 +50,7 @@ public class AdminRoleLogic {
                     if (!adminUser.getUserName().equals("admin") && adminUser.getType().equals(0)) {
                     if (!adminUser.getUserName().equals("admin") && adminUser.getType().equals(0)) {
                         v.in(CollectionUtils.isNotEmpty(companyIds), AdminRole::getCompanyId, companyIds)
                         v.in(CollectionUtils.isNotEmpty(companyIds), AdminRole::getCompanyId, companyIds)
                                 .or()
                                 .or()
-                                .eq(AdminRole::getCompanyId, "");
+                                .isNull(AdminRole::getCompanyId);
                     } else {
                     } else {
                         v.in(CollectionUtils.isNotEmpty(companyIds), AdminRole::getCompanyId, companyIds);
                         v.in(CollectionUtils.isNotEmpty(companyIds), AdminRole::getCompanyId, companyIds);
                     }
                     }

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

@@ -357,7 +357,7 @@ public class AdminUserLogic {
                     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()
-                                .isNull(AdminUser::getCompanyId);
+                                .eq(AdminUser::getCompanyId, "");
                     } else {
                     } else {
                         v.in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()), AdminUser::getCompanyId, adminUser.getAdminCompanyIds());
                         v.in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()), AdminUser::getCompanyId, adminUser.getAdminCompanyIds());
                     }
                     }