|
|
@ -87,7 +87,6 @@ public class UserController {
|
|
|
|
.and(param.getDepartment() != null, q -> q.like("t2.name", param.getDepartment())
|
|
|
|
.and(param.getDepartment() != null, q -> q.like("t2.name", param.getDepartment())
|
|
|
|
.or(o -> o.like("t3.name", param.getDepartment())))
|
|
|
|
.or(o -> o.like("t3.name", param.getDepartment())))
|
|
|
|
.like(param.getName() != null, "t1.name", param.getName());
|
|
|
|
.like(param.getName() != null, "t1.name", param.getName());
|
|
|
|
qw.orderByDesc("updateAt","creatAt");
|
|
|
|
|
|
|
|
return Result.success(userService.pageList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), qw));
|
|
|
|
return Result.success(userService.pageList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), qw));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|