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

mec-application/src/main/java/com/ym/mec/web/controller/MusicSheetApplicationExtendController.java

@@ -55,7 +55,7 @@ public class MusicSheetApplicationExtendController {
     @PreAuthorize("@pcs.hasPermissions('musicSheetApplicationExtend/pageByApplication')")
     @PostMapping({"/pageByApplication"})
     public R<com.ym.mec.common.page.PageInfo<MusicSheetWrapper.MusicSheetApplication>> musicSheetPageByApplication(@RequestBody CbsMusicSheetWrapper.MusicSheetQuery var1) {
-        var1.setApplicationId(Long.parseLong(openFeignClientConfigProperties.getAppId()));
+        var1.setAddAppId(Long.parseLong(openFeignClientConfigProperties.getAppId()));
         try {
             PageInfo<CbsMusicSheetWrapper.MusicSheet> info = this.musicFeignClientService.musicSheetPage(var1).feignData();
             List<CbsMusicSheetWrapper.MusicSheet> rows = info.getRows();

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

@@ -430,7 +430,8 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         addMusicSheet.setAppAuditFlag(false);
         addMusicSheet.setRemark(from.getMuseScoreMemo());
         addMusicSheet.setIsPlayBeat(true);
-        if(categoryIds.contains(from.getMusicScoreCategoriesId().toString())){
+
+        if(Arrays.stream(categoryIds.split(",")).anyMatch(e->e.equals(from.getMusicScoreCategoriesId().toString()))){
             addMusicSheet.setMusicSheetType(EMusicSheetType.CONCERT);
         }else {
             addMusicSheet.setMusicSheetType(EMusicSheetType.SINGLE);

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

@@ -143,7 +143,8 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScore" parameterType="map">
 		SELECT ses.*,su.real_name_ create_user_name_,smsc.name_ categories_name_,smsc.id_ categories_id_,
-		smsa.mp3_url_ accompaniment_url_,smsa.metronome_mp3_url_ accompaniment_metronome_url_,smsa.is_open_metronome_,smsa.subject_id_,ses.subject_ids_,smsa.xml_url_
+		smsa.mp3_url_ accompaniment_url_,smsa.metronome_mp3_url_ accompaniment_metronome_url_,
+		smsa.is_open_metronome_,smsa.subject_id_,ses.subject_ids_,smsa.xml_url_
 		FROM sys_music_score ses
 		LEFT JOIN sys_music_score_accompaniment smsa ON smsa.exam_song_id_ = ses.id_
 		LEFT JOIN sys_user su ON ses.create_user_id_ = su.id_