|
@@ -2032,7 +2032,7 @@
|
|
SELECT cs.id_ FROM course_schedule cs
|
|
SELECT cs.id_ FROM course_schedule cs
|
|
LEFT JOIN music_group mg ON cs.music_group_id_ = mg.id_
|
|
LEFT JOIN music_group mg ON cs.music_group_id_ = mg.id_
|
|
LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
|
|
LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
|
|
- WHERE cs.group_type_ = 'MUSIC' AND mg.status_ = 'PROGRESS' AND cs.del_flag_ = 0 AND cg.del_flag_ = 0
|
|
|
|
|
|
+ WHERE cs.group_type_ = 'MUSIC' AND cs.del_flag_ = 0 AND cg.del_flag_ = 0
|
|
<if test="search != null and search != ''">
|
|
<if test="search != null and search != ''">
|
|
AND (mg.id_ = #{search} OR mg.name_ LIKE CONCAT('%',#{search},'%')
|
|
AND (mg.id_ = #{search} OR mg.name_ LIKE CONCAT('%',#{search},'%')
|
|
OR cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%')
|
|
OR cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%')
|
|
@@ -2070,7 +2070,7 @@
|
|
SELECT cs.id_ FROM course_schedule cs
|
|
SELECT cs.id_ FROM course_schedule cs
|
|
LEFT JOIN vip_group vg ON cs.music_group_id_ = vg.id_
|
|
LEFT JOIN vip_group vg ON cs.music_group_id_ = vg.id_
|
|
LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
|
|
LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
|
|
- WHERE cs.group_type_ = 'VIP' AND vg.group_status_ IN(2,4) AND cs.del_flag_ = 0 AND cg.del_flag_ = 0
|
|
|
|
|
|
+ WHERE cs.group_type_ = 'VIP' AND cs.del_flag_ = 0 AND cg.del_flag_ = 0
|
|
<if test="search != null and search != ''">
|
|
<if test="search != null and search != ''">
|
|
AND (vg.id_ = #{search} OR vg.name_ LIKE CONCAT('%',#{search},'%')
|
|
AND (vg.id_ = #{search} OR vg.name_ LIKE CONCAT('%',#{search},'%')
|
|
OR cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%')
|
|
OR cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%')
|