|
@@ -554,6 +554,7 @@
|
|
|
LEFT JOIN school s ON cs.schoole_id_=s.id_
|
|
|
WHERE
|
|
|
(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
|
|
|
+ AND cs.new_course_id_ IS NULL
|
|
|
<if test="classGroupIds != null and organIdList!=null">
|
|
|
AND cs.class_group_id_ IN
|
|
|
<foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
|
|
@@ -580,6 +581,7 @@
|
|
|
LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
|
|
|
WHERE
|
|
|
(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
|
|
|
+ AND cs.new_course_id_ IS NULL
|
|
|
AND cs.id_ IS NOT NULL
|
|
|
<if test="type!=null">
|
|
|
AND cg.group_type_ = #{type}
|
|
@@ -980,6 +982,7 @@
|
|
|
LEFT JOIN teacher t ON cs.actual_teacher_id_=t.id_
|
|
|
WHERE
|
|
|
(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
|
|
|
+ AND cs.new_course_id_ IS NULL
|
|
|
AND cs.class_group_id_ IN
|
|
|
<foreach collection="classGroupIds" item="classGroupId" separator="," open="(" close=")">
|
|
|
#{classGroupId}
|