|
@@ -209,6 +209,7 @@ public class UserController {
|
|
|
.eq(ObjectUtil.isNotNull(dto.getUserType()), Role::getId, dto.getUserType())
|
|
.eq(ObjectUtil.isNotNull(dto.getUserType()), Role::getId, dto.getUserType())
|
|
|
.eq(ObjectUtil.isNotNull(dto.getEmployType()), BaseTeacher::getEmployType, dto.getEmployType())
|
|
.eq(ObjectUtil.isNotNull(dto.getEmployType()), BaseTeacher::getEmployType, dto.getEmployType())
|
|
|
.eq(ObjectUtil.isNotNull(dto.getEmployWay()), BaseTeacher::getEmployWay, dto.getEmployWay())
|
|
.eq(ObjectUtil.isNotNull(dto.getEmployWay()), BaseTeacher::getEmployWay, dto.getEmployWay())
|
|
|
|
|
+ .eq(ObjectUtil.isNotNull(dto.getClassId()), BaseStudentSchoolRoll::getClassId, dto.getClassId())
|
|
|
.orderByDesc(User::getId)
|
|
.orderByDesc(User::getId)
|
|
|
.select(User::getId)
|
|
.select(User::getId)
|
|
|
.select("d1.name", UserPageVo::getEmployWay)
|
|
.select("d1.name", UserPageVo::getEmployWay)
|
|
@@ -260,6 +261,7 @@ public class UserController {
|
|
|
.eq((ObjectUtil.isNotNull(dto.getTreeType()) && dto.getTreeType() == 4), BaseStudentSchoolRoll::getClassId, dto.getTreeId())
|
|
.eq((ObjectUtil.isNotNull(dto.getTreeType()) && dto.getTreeType() == 4), BaseStudentSchoolRoll::getClassId, dto.getTreeId())
|
|
|
.eq(ObjectUtil.isNotNull(dto.getEmployType()), BaseTeacher::getEmployType, dto.getEmployType())
|
|
.eq(ObjectUtil.isNotNull(dto.getEmployType()), BaseTeacher::getEmployType, dto.getEmployType())
|
|
|
.eq(ObjectUtil.isNotNull(dto.getEmployWay()), BaseTeacher::getEmployWay, dto.getEmployWay())
|
|
.eq(ObjectUtil.isNotNull(dto.getEmployWay()), BaseTeacher::getEmployWay, dto.getEmployWay())
|
|
|
|
|
+ .eq(ObjectUtil.isNotNull(dto.getClassId()), BaseStudentSchoolRoll::getClassId, dto.getClassId())
|
|
|
.orderByDesc(User::getId)
|
|
.orderByDesc(User::getId)
|
|
|
.select(User::getId)
|
|
.select(User::getId)
|
|
|
.select("d1.name", UserPageVo::getEmployWay)
|
|
.select("d1.name", UserPageVo::getEmployWay)
|