Merge remote-tracking branch 'origin/online1' into online1

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

@@ -1678,7 +1678,7 @@
         SELECT sr.user_id_ 'key',GROUP_CONCAT(mg.name_) 'value'
         FROM student_registration sr
              LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
-        WHERE 1=1
+        WHERE mg.status_='PROGRESS'
         <if test="studentIds!=null and studentIds.size()>0">
             AND sr.user_id_ IN
             <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">