|
@@ -13,7 +13,7 @@ public class UserQuery extends BaseQuery<User> {
|
|
|
|
|
|
private String loginNameStartWith;
|
|
|
|
|
|
- private Role role;
|
|
|
+ private Role[] role;
|
|
|
|
|
|
public Long getId() {
|
|
|
return id;
|
|
@@ -31,16 +31,21 @@ public class UserQuery extends BaseQuery<User> {
|
|
|
this.loginNameStartWith = loginNameStartWith;
|
|
|
}
|
|
|
|
|
|
- public Role getRole() {
|
|
|
+ public Role[] getRole() {
|
|
|
return role;
|
|
|
}
|
|
|
|
|
|
- public void setRole(Role role) {
|
|
|
+ public void setRole(Role[] role) {
|
|
|
this.role = role;
|
|
|
}
|
|
|
|
|
|
public LambdaQueryWrapper<User> build() {
|
|
|
- return new LambdaQueryWrapper<User>().eq(id != null, User::getId, id).in(role != null, User::getRole, role)
|
|
|
- .likeRight(loginNameStartWith != null, User::getLoginName, loginNameStartWith);
|
|
|
+ return new LambdaQueryWrapper<User>().eq(id != null, User::getId, id)
|
|
|
+ .likeRight(loginNameStartWith != null, User::getLoginName, loginNameStartWith)
|
|
|
+ .and(role != null && role.length > 0, wrapper -> {
|
|
|
+ for (Role item : role) {
|
|
|
+ wrapper.or().like(User::getRole, item);
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
}
|