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

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

@@ -217,8 +217,8 @@
 			<if test="param.id != null">
 				and t.id_ = #{param.id}
 			</if>
-			<if test="param.delFlag != null">
-				and t.enable_ = #{param.delFlag}
+			<if test="param.enable != null">
+				and t.enable_ = #{param.enable}
 			</if>
 		</where>
 	</select>

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

@@ -245,7 +245,7 @@
 	<insert id="batchInsert">
 		insert into sys_music_score
 		(music_score_categories_id_,client_type_,type_,rank_ids_,order_
-		,name_,subject_ids_,speed_,enable_evaluation_,play_mode_,show_flag_)
+		,name_,subject_ids_,speed_,enable_evaluation_,play_mode_,show_flag_,cbs_music_sheet_id_)
 		values
 		<foreach collection="vos" item="item" separator=",">
 			(#{item.musicSheetCategoryId},
@@ -256,7 +256,8 @@
 			#{item.musicSheetUpdate.subjectIds},
 			#{item.musicSheetUpdate.playSpeed},
 			#{item.musicSheetUpdate.canEvaluate},
-			#{item.musicSheetUpdate.playMode},0
+			#{item.musicSheetUpdate.playMode},0,
+			#{item.musicSheetId}
 			)
 		</foreach>
 	</insert>