|
|
@@ -256,7 +256,9 @@
|
|
|
LEFT JOIN sys_user su ON cgsm.user_id_ = su.id_
|
|
|
LEFT JOIN student_registration sr ON sr.user_id_ = su.id_
|
|
|
LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
|
|
|
- WHERE cgtm.user_id_ = #{teacherId} AND su.id_ IS NOT NULL AND cgtm.music_group_id_ = sr.music_group_id_
|
|
|
+ LEFT JOIN music_group mg ON mg.id_ = cgtm.music_group_id_
|
|
|
+ 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 AND cgtm.music_group_id_ = sr.music_group_id_
|
|
|
<if test="search != null">
|
|
|
AND su.username_ LIKE CONCAT('%',#{search},'%')
|
|
|
</if>
|
Joburgess