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