Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_export_0814

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreServiceImpl.java

@@ -308,8 +308,11 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         this.initCategoryIds(queryInfo);
         if(queryInfo.getSubjectId() != null){
             if(queryInfo.getSubjectId() == 5){
-                queryInfo.setSubjectId(6);
+                queryInfo.setSubjectId(null);
                 queryInfo.setSubjectIds("6");
+            }else if(queryInfo.getSubjectId() == 122){
+                queryInfo.setSubjectId(null);
+                queryInfo.setSubjectIds("122,121,113,23");
             }else {
                 queryInfo.setSubjectIds(queryInfo.getSubjectId().toString());
             }

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

@@ -3857,7 +3857,7 @@
     </select>
     <select id="getUnderwayCourseNum" resultType="int">
         SELECT COUNT(*) FROM course_schedule WHERE music_group_id_ = #{musicGroupId}
-        AND group_type_ = #{groupType} AND status_=#{status} AND pre_course_flag_ = 0 AND cs.del_flag_ = '0'
+        AND group_type_ = #{groupType} AND status_=#{status} AND pre_course_flag_ = 0 AND del_flag_ = '0'
     </select>
 
     <select id="getMusicGroupCourseInfo" resultMap="CourseSchedule"><![CDATA[

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

@@ -286,7 +286,7 @@
 				AND (FIND_IN_SET(#{subjectId},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '' OR ses.is_all_subject_)
 			</if>
 			<if test="subjectIds != null and subjectIds != ''">
-				AND (FIND_IN_SET(#{subjectIds},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '' OR ses.is_all_subject_)
+				AND (INTE_ARRAY(#{subjectIds},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '' OR ses.is_all_subject_)
 			</if>
 			<if test="clientType != null">
 				AND ses.client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}