|
@@ -1960,7 +1960,7 @@
|
|
|
select DISTINCT sr.user_id_ from student_registration sr
|
|
|
left join music_group mg ON mg.id_ = sr.music_group_id_
|
|
|
<if test="classGroupId != null">
|
|
|
- left join class_group_student_mapper cgsm ON cgsm.music_group_id_ = sr.music_group_id_
|
|
|
+ left join class_group_student_mapper cgsm ON cgsm.music_group_id_ = sr.music_group_id_ AND cgsm.user_id_ = sr.user_id_
|
|
|
</if>
|
|
|
where sr.music_group_id_ = #{musicGroupId} AND sr.music_group_status_ = 'NORMAL' AND mg.status_ = 'PROGRESS'
|
|
|
<if test="classGroupId != null">
|