|
|
@@ -261,12 +261,12 @@
|
|
|
FROM class_group_teacher_mapper cgtm
|
|
|
LEFT JOIN class_group_student_mapper cgsm ON cgtm.class_group_id_ = cgsm.class_group_id_
|
|
|
LEFT JOIN sys_user su ON cgsm.user_id_ = su.id_
|
|
|
- LEFT JOIN student_registration sr ON sr.user_id_ = cgsm.id_ AND cgsm.music_group_id_ = sr.music_group_id_
|
|
|
+ LEFT JOIN student_registration sr ON sr.user_id_ = cgsm.user_id_ AND cgsm.music_group_id_ = sr.music_group_id_
|
|
|
LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
|
|
|
LEFT JOIN music_group mg ON mg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'MUSIC'
|
|
|
LEFT JOIN vip_group vg ON vg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'VIP'
|
|
|
WHERE (cgtm.user_id_ = #{teacherId} OR mg.team_teacher_id_ = #{teacherId} OR mg.educational_teacher_id_ = #{teacherId}
|
|
|
- OR director_user_id_ = #{teacherId}) AND su.id_ IS NOT NULL
|
|
|
+ OR director_user_id_ = #{teacherId}) AND su.id_ IS NOT NULL AND sr.music_group_status_ != 'QUIT'
|
|
|
AND (mg.status_ = 'PROGRESS' OR vg.group_status_ IN (2,4) OR cgsm.group_type_ = 'PRACTICE')
|
|
|
<if test="search != null">
|
|
|
AND su.username_ LIKE CONCAT('%',#{search},'%')
|
zouxuan