|
@@ -257,7 +257,7 @@
|
|
|
</if>
|
|
</if>
|
|
|
</if>
|
|
</if>
|
|
|
<if test="dto.teacherId != null">
|
|
<if test="dto.teacherId != null">
|
|
|
- and t5.teacher_id = #{dto.teacherId}
|
|
|
|
|
|
|
+ and (t5.teacher_id = #{dto.teacherId} or t5.id is null)
|
|
|
</if>
|
|
</if>
|
|
|
<if test="dto.gradeId != null">
|
|
<if test="dto.gradeId != null">
|
|
|
and t4.id = #{dto.gradeId}
|
|
and t4.id = #{dto.gradeId}
|
|
@@ -329,7 +329,7 @@
|
|
|
</if>
|
|
</if>
|
|
|
</if>
|
|
</if>
|
|
|
<if test="dto.teacherId != null">
|
|
<if test="dto.teacherId != null">
|
|
|
- and t5.teacher_id = #{dto.teacherId}
|
|
|
|
|
|
|
+ and (t5.teacher_id = #{dto.teacherId} or t5.id is null)
|
|
|
</if>
|
|
</if>
|
|
|
<if test="dto.gradeId != null">
|
|
<if test="dto.gradeId != null">
|
|
|
and t4.id = #{dto.gradeId}
|
|
and t4.id = #{dto.gradeId}
|