Merge branch 'zx_saas_cbs' of http://git.dayaedu.com/yonge/mec into dev

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

@@ -313,7 +313,7 @@
         SELECT * FROM `subject` WHERE del_flag_ = 0 AND parent_subject_id_ != 0
         <if test="cbsSubjectIds != null and cbsSubjectIds.size > 0">
             AND cbs_subject_id_ IN
-            <foreach collection="query.cbsSubjectIds" item="cbsSubjectId" open="(" close=")" separator=",">
+            <foreach collection="cbsSubjectIds" item="cbsSubjectId" open="(" close=")" separator=",">
                 #{cbsSubjectId}
             </foreach>
         </if>

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

@@ -216,7 +216,7 @@
 			update sys_music_score set music_score_categories_id_ = #{item.musicSheetCategoryId},
 			client_type_ = 'SMART_PRACTICE',type_ = 'COMMON',
 			rank_ids_ = CASE WHEN #{item.paymentType} = 'FREE' THEN NULL ELSE '1' END,
-			order_ = #{item.sortNo}
+			order_ = #{item.sortNo},del_flag_ = 0
 			<if test="item.musicSheetUpdate != null">
 				,name_ = #{item.musicSheetUpdate.name},
 				subject_ids_ = #{item.musicSheetUpdate.subjectIds},