|
@@ -267,9 +267,10 @@
|
|
|
SELECT cg.id_,cg.name_,cg.student_num_,cg.img_,mg.name_ group_name_
|
|
|
FROM class_group_student_mapper cgsm
|
|
|
LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
|
|
|
- LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_
|
|
|
+ LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
|
|
|
+ LEFT JOIN vip_group vg ON vg.id_ = cg.music_group_id_ AND cg.group_type_ = 'VIP'
|
|
|
<where>
|
|
|
- cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND mg.status_ = 'PROGRESS'
|
|
|
+ cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND (mg.status_ = 'PROGRESS' OR vg.group_status_ = 2)
|
|
|
<if test="userId != null">
|
|
|
AND cgsm.user_id_ = #{userId}
|
|
|
</if>
|