|
@@ -64,7 +64,7 @@ public class TeacherbaseManagerController {
|
|
|
.like(StrUtil.isNotBlank(dto.getMobile()),XjrUser::getMobile,dto.getMobile())
|
|
.like(StrUtil.isNotBlank(dto.getMobile()),XjrUser::getMobile,dto.getMobile())
|
|
|
.like(StrUtil.isNotBlank(dto.getName()),XjrUser::getName,dto.getName())
|
|
.like(StrUtil.isNotBlank(dto.getName()),XjrUser::getName,dto.getName())
|
|
|
.like(StrUtil.isNotBlank(dto.getEmail()),XjrUser::getEmail,dto.getEmail())
|
|
.like(StrUtil.isNotBlank(dto.getEmail()),XjrUser::getEmail,dto.getEmail())
|
|
|
- .eq(ObjectUtil.isNotNull(dto.getOrgId()), UserDeptRelation::getDeptId, dto.getOrgId())
|
|
|
|
|
|
|
+ .eq(ObjectUtil.isNotNull(dto.getDepartmentId()), UserDeptRelation::getDeptId, dto.getDepartmentId())
|
|
|
.orderByDesc(XjrUser::getId)
|
|
.orderByDesc(XjrUser::getId)
|
|
|
.select(XjrUser::getId)
|
|
.select(XjrUser::getId)
|
|
|
.select(XjrUser.class,x -> VoToColumnUtil.fieldsToColumns(XjrUserPageVo.class).contains(x.getProperty()))
|
|
.select(XjrUser.class,x -> VoToColumnUtil.fieldsToColumns(XjrUserPageVo.class).contains(x.getProperty()))
|