update
This commit is contained in:
parent
d22088130d
commit
2032c3201b
|
@ -435,7 +435,8 @@ public class UserServiceImpl extends BaseService<UserMapper, User> implements IU
|
|||
String value = userVo.getValue();
|
||||
String job = userVo.getJob();
|
||||
MPJQueryWrapper<User> qw = new MPJQueryWrapper<User>();
|
||||
qw.selectAll(User.class).leftJoin("t_sys_dept dept on dept.id = t.dept");
|
||||
qw.selectAll(User.class).leftJoin("t_sys_dept dept on dept.id = t.dept")
|
||||
.leftJoin("t_sys_job job on job.id = t.job");
|
||||
if (StrUtil.isNotBlank(value)) {
|
||||
qw.and(query ->
|
||||
query.like("AES_DECRYPT(from_base64 (t.phone),'" + CodecUtils.KEY + "')", value).lambda()
|
||||
|
@ -447,7 +448,7 @@ public class UserServiceImpl extends BaseService<UserMapper, User> implements IU
|
|||
qw.lambda()
|
||||
.in(CollUtil.isNotEmpty(userVo.getDeptIds()), User::getDept, userVo.getDeptIds())
|
||||
.eq(StrUtil.isNotBlank(job), User::getJob, job);
|
||||
qw.orderByAsc("dept.sort_no");
|
||||
qw.orderByAsc("dept.sort_no","job.sort_no");
|
||||
|
||||
|
||||
Page<User> pageList = page(new Page<>(userVo.getCurrent(), userVo.getSize()), qw);
|
||||
|
|
Loading…
Reference in New Issue