|
@@ -362,6 +362,9 @@
|
|
|
and t2.floor_number = #{dto.floorNumber}
|
|
and t2.floor_number = #{dto.floorNumber}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="dto.classId != null and dto.isTeacher != null and dto.isTeacher == 1">
|
|
<if test="dto.classId != null and dto.isTeacher != null and dto.isTeacher == 1">
|
|
|
|
|
+ AND t8.id = #{dto.classId}
|
|
|
|
|
+ </if>
|
|
|
|
|
+ <if test="dto.classId != null and dto.isTeacher == null">
|
|
|
AND (t2.id IN (
|
|
AND (t2.id IN (
|
|
|
SELECT DISTINCT c1.room_id FROM room_bed c1
|
|
SELECT DISTINCT c1.room_id FROM room_bed c1
|
|
|
INNER JOIN base_student_school_roll c2 ON c1.student_user_id = c2.user_id
|
|
INNER JOIN base_student_school_roll c2 ON c1.student_user_id = c2.user_id
|