Jelajahi Sumber

用户列表增加班级查询id

dzx 1 tahun lalu
induk
melakukan
59c40128d7

+ 2 - 0
src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -209,6 +209,7 @@ public class UserController {
                     .eq(ObjectUtil.isNotNull(dto.getUserType()), Role::getId, dto.getUserType())
                     .eq(ObjectUtil.isNotNull(dto.getEmployType()), BaseTeacher::getEmployType, dto.getEmployType())
                     .eq(ObjectUtil.isNotNull(dto.getEmployWay()), BaseTeacher::getEmployWay, dto.getEmployWay())
+                    .eq(ObjectUtil.isNotNull(dto.getClassId()), BaseStudentSchoolRoll::getClassId, dto.getClassId())
                     .orderByDesc(User::getId)
                     .select(User::getId)
                     .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.getEmployType()), BaseTeacher::getEmployType, dto.getEmployType())
                             .eq(ObjectUtil.isNotNull(dto.getEmployWay()), BaseTeacher::getEmployWay, dto.getEmployWay())
+                            .eq(ObjectUtil.isNotNull(dto.getClassId()), BaseStudentSchoolRoll::getClassId, dto.getClassId())
                             .orderByDesc(User::getId)
                             .select(User::getId)
                             .select("d1.name", UserPageVo::getEmployWay)

+ 3 - 0
src/main/java/com/xjrsoft/module/organization/dto/UserPageDto.java

@@ -43,4 +43,7 @@ public class UserPageDto extends PageInput {
     private String employType;
 
     private String employWay;
+
+    @ApiModelProperty("班级id")
+    private Long classId;
 }