|
@@ -606,6 +606,9 @@ public class AdminUserLogic {
|
|
|
.eq(status != null, AdminUser::getStatus, status)
|
|
|
.like(StringUtils.isNotBlank(userName), AdminUser::getUserName, userName)
|
|
|
.in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()), AdminUser::getCompanyWechatId, adminUser.getCompanyWechatIds())
|
|
|
+ .and(!CollectionUtils.isNotEmpty(adminUserIds),item -> item.in( AdminUser::getAdminUserId, adminUserIds)
|
|
|
+ .ne(AdminUser::getUserName,"admin")
|
|
|
+ )
|
|
|
.and(adminUser.getIsMaster() && adminUser.getType() == 0, v -> v.eq(AdminUser::getAdminUserId, adminUser.getAdminUserId())
|
|
|
.or()
|
|
|
.in(AdminUser::getMasterWebsitId, adminUser.getAdminWebsitIds()))
|