|
|
@@ -90,7 +90,7 @@
|
|
|
LEFT JOIN base_class t11 ON t10.class_id = t11.id
|
|
|
LEFT JOIN xjr_user t12 ON t11.teacher_id = t12.id
|
|
|
LEFT JOIN student_report_record t13 ON t9.id = t13.user_id and t13.base_semester_id = #{dto.baseSemesterId}
|
|
|
- WHERE t1.delete_mark = 0
|
|
|
+ WHERE t1.delete_mark = 0 and (t1.delete_reason is null or t1.delete_reason = '')
|
|
|
<if test="dto.name != null and dto.name != ''">
|
|
|
and t1.name like concat('%', #{dto.name}, '%')
|
|
|
</if>
|
