Merge remote-tracking branch 'origin/master'

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

@@ -640,7 +640,7 @@
         LEFT JOIN class_group_student_mapper cgsm ON cg.id_ = cgsm.class_group_id_
         LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
         WHERE
-        cg.type_ IN ('HIGH_ONLINE')
+        cg.type_ IN ('HIGH', 'HIGH_ONLINE')
         AND mg.status_ = 'PROGRESS' AND cg.del_flag_ = 0
         <if test="organIds!=null and organIds!=''">
             AND FIND_IN_SET(mg.organ_id_, #{organIds})

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

@@ -473,7 +473,7 @@
 		LEFT JOIN class_group_student_mapper cgsm ON cg.id_ = cgsm.class_group_id_
 		LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
 		WHERE
-		cg.type_ IN ('HIGH_ONLINE')
+		cg.type_ IN ('HIGH', 'HIGH_ONLINE')
 		AND mg.status_ = 'PROGRESS' AND cg.del_flag_ = 0
 		<if test="organIds!=null and organIds.size()>0">
 			AND mg.organ_id_ IN

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

@@ -109,7 +109,7 @@
                 </if>
             </if>
             <if test="organId != null and organId != ''">
-                FIND_IN_SET(mg.organ_id_,#{organId})
+                AND FIND_IN_SET(mg.organ_id_,#{organId})
             </if>
         </where>
     </sql>