|
|
@@ -196,7 +196,8 @@ public class UserController {
|
|
|
.select("d1.name", UserPageVo::getEmployWay)
|
|
|
.select("d2.name", UserPageVo::getEmployType)
|
|
|
.selectAs(BaseStudentSchoolRoll::getClassId, UserPageVo::getClassId)
|
|
|
- .select(User.class, x -> VoToColumnUtil.fieldsToColumns(UserPageVo.class).contains(x.getProperty()))
|
|
|
+ .select(User.class, x -> VoToColumnUtil.fieldsToColumns(UserPageVo.class,List.of("mobile")).contains(x.getProperty()))
|
|
|
+ .select("CONCAT(LEFT(t.mobile, 3), '****', RIGHT(t.mobile, 4))",UserPageVo::getMobile)
|
|
|
.leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, User::getId)
|
|
|
.leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, User::getId)
|
|
|
.leftJoin(BaseTeacher.class, BaseTeacher::getUserId, User::getId)
|
|
|
@@ -261,7 +262,8 @@ public class UserController {
|
|
|
.select("d1.name", UserPageVo::getEmployWay)
|
|
|
.select("d2.name", UserPageVo::getEmployType)
|
|
|
.selectAs(BaseStudentSchoolRoll::getClassId, UserPageVo::getClassId)
|
|
|
- .select(User.class, x -> VoToColumnUtil.fieldsToColumns(UserPageVo.class).contains(x.getProperty()))
|
|
|
+ .select(User.class, x -> VoToColumnUtil.fieldsToColumns(UserPageVo.class,List.of("mobile")).contains(x.getProperty()))
|
|
|
+ .select("CONCAT(LEFT(t.mobile, 3), '****', RIGHT(t.mobile, 4))",UserPageVo::getMobile)
|
|
|
.leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, User::getId)
|
|
|
.leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, User::getId)
|
|
|
.leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, User::getId)
|