|
@@ -529,7 +529,7 @@
|
|
|
LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_ AND sa.user_id_=#{studentId}
|
|
|
WHERE
|
|
|
(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
|
|
|
- AND cs.is_lock_=0
|
|
|
+ AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
|
|
|
AND cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
|
|
|
AND cssp.user_id_ = #{studentId}
|
|
|
<if test="quitClassGroupIds != null and quitClassGroupIds.size()>0">
|
|
@@ -570,7 +570,7 @@
|
|
|
LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_ AND ta.teacher_id_=#{teacherId}
|
|
|
WHERE
|
|
|
(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
|
|
|
- AND cs.is_lock_=0
|
|
|
+ AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
|
|
|
AND cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
|
|
|
<if test="type!=null and type!=''">
|
|
|
AND cs.type_=#{type}
|