|
@@ -179,7 +179,6 @@
|
|
|
LEFT JOIN base_office_build t3 ON t2.office_build_id = t3.id
|
|
LEFT JOIN base_office_build t3 ON t2.office_build_id = t3.id
|
|
|
LEFT JOIN xjr_user t4 ON t1.student_user_id = t4.id
|
|
LEFT JOIN xjr_user t4 ON t1.student_user_id = t4.id
|
|
|
LEFT JOIN xjr_dictionary_detail t5 ON t2.gender = t5.code AND t5.item_id = 2023000000000000004
|
|
LEFT JOIN xjr_dictionary_detail t5 ON t2.gender = t5.code AND t5.item_id = 2023000000000000004
|
|
|
- LEFT JOIN room_student_appoint t6 ON t6.room_bed_id = t1.id
|
|
|
|
|
LEFT JOIN base_student_school_roll t7 ON t4.id = t7.user_id
|
|
LEFT JOIN base_student_school_roll t7 ON t4.id = t7.user_id
|
|
|
WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
|
|
WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
|
|
|
<if test="dto.isEmptyRoom != null">
|
|
<if test="dto.isEmptyRoom != null">
|
|
@@ -205,6 +204,9 @@
|
|
|
<if test="dto.classId != null">
|
|
<if test="dto.classId != null">
|
|
|
and t7.class_id = #{dto.classId}
|
|
and t7.class_id = #{dto.classId}
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="dto.buildId != null">
|
|
|
|
|
+ and t3.id = #{dto.buildId}
|
|
|
|
|
+ </if>
|
|
|
ORDER BY t2.sort_code,t1.sort_code
|
|
ORDER BY t2.sort_code,t1.sort_code
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
