Merge branch 'zx_saas_0422' of http://git.dayaedu.com/yonge/mec into test

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

@@ -1705,6 +1705,9 @@
         LEFT JOIN music_group mg ON cgtm.music_group_id_ = mg.id_
         LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
         where cg.del_flag_ = 0 AND mg.status_ = 'PROGRESS' AND cgtm.user_id_ = #{teacherId}
+        <if test="musicGroupId != null and musicGroupId != ''">
+            AND cgtm.music_group_id_ = #{musicGroupId}
+        </if>
         GROUP BY cg.id_
     </select>
 </mapper>