|
@@ -296,13 +296,13 @@
|
|
|
LEFT JOIN music_group mg ON cgtm.music_group_id_ = mg.id_
|
|
|
LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
|
|
|
LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
|
|
|
- LEFT JOIN course_schedule cs ON (FIND_IN_SET(cs.class_group_id_,cg.id_) AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW())
|
|
|
+ LEFT JOIN course_schedule cs ON (FIND_IN_SET(cs.class_group_id_,cg.id_) AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW()) AND cs.pre_course_flag_ = 0
|
|
|
<include refid="queryGroupCoursesSql"/>
|
|
|
GROUP BY cgtm.id_
|
|
|
<include refid="global.limit"/>
|
|
|
</select>
|
|
|
<sql id="queryGroupCoursesSql">
|
|
|
- WHERE cgtm.user_id_ = #{search} AND cg.del_flag_ = 0 AND cg.group_type_ = 'MUSIC' AND cs.pre_course_flag_ = 0
|
|
|
+ WHERE cgtm.user_id_ = #{search} AND cg.del_flag_ = 0 AND cg.group_type_ = 'MUSIC'
|
|
|
<if test="status != null">
|
|
|
AND mg.status_ = #{status}
|
|
|
</if>
|
|
@@ -312,8 +312,6 @@
|
|
|
FROM class_group_teacher_mapper cgtm
|
|
|
LEFT JOIN music_group mg ON cgtm.music_group_id_ = mg.id_
|
|
|
LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
|
|
|
- LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
|
|
|
- LEFT JOIN course_schedule cs ON (FIND_IN_SET(cs.class_group_id_,cg.id_) AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW())
|
|
|
<include refid="queryGroupCoursesSql"/>
|
|
|
</select>
|
|
|
|