Merge remote-tracking branch 'origin/master'

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -256,7 +256,7 @@
         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
+        WHERE cgtm.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>