Merge branch 'fix/0411' into develop-new

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -239,8 +239,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         //musicSheet.setState(YesOrNoEnum.NO);
         this.saveOrUpdate(musicSheet);
 
-        if (StringUtil.isEmpty(musicSheet.getMusicSubject())
-                && musicSheet.getMusicSheetType().equals(MusicSheetTypeEnum.CONCERT)) {
+        if (musicSheet.getMusicSheetType().equals(MusicSheetTypeEnum.CONCERT)) {
             this.lambdaUpdate()
                     .eq(MusicSheet::getId, musicSheet.getId())
                     .set(MusicSheet::getMusicSubject,"")
@@ -1181,8 +1180,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             //musicSheet.setState(YesOrNoEnum.NO);
             this.saveOrUpdate(musicSheet);
 
-            if (StringUtil.isEmpty(musicSheet.getMusicSubject())
-                    && musicSheet.getMusicSheetType().equals(MusicSheetTypeEnum.CONCERT)) {
+            if (musicSheet.getMusicSheetType().equals(MusicSheetTypeEnum.CONCERT)) {
                 this.lambdaUpdate()
                         .eq(MusicSheet::getId, musicSheet.getId())
                         .set(MusicSheet::getMusicSubject,"")

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -175,7 +175,7 @@
             <foreach collection="param.subjectIdList" separator="or" item="item" open="(" close=")">
                 find_in_set(#{item},t.music_subject_)
             </foreach>
-            or t.music_subject_ is null or t.music_subject_ = ''
+            or t.music_subject_ is null or t.music_subject_ = ''  or t.music_sheet_type_ = 'CONCERT'
             )
         </if>
         <if test="param.musicSheetIdlist != null and param.musicSheetIdlist.size() != 0">
@@ -885,7 +885,7 @@
             <where>
                 t.state_=1 and t.audit_version_ = 0 and t.del_flag_ = 0 and t.audit_status_ = 'PASS'
                 <if test="param.subjectId != null">
-                    and ( t.music_subject_ = #{param.subjectId} or t.music_subject_ is null or t.music_subject_ = '')
+                    and ( t.music_subject_ = #{param.subjectId} or t.music_subject_ is null or t.music_subject_ = ''  or t.music_sheet_type_ = 'CONCERT')
                 </if>
                 <if test="param.name != null and param.name != ''">
                     and t.music_sheet_name_ like concat('%',#{param.name},'%')

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantAlbumMusicMapper.xml

@@ -36,7 +36,7 @@
                 and (find_in_set(#{param.musicTagId},m.music_tag_)
             </if>
             <if test="param.subjectId != null" >
-                and (find_in_set(#{param.subjectId},m.music_subject_) or m.music_subject_ is null or m.music_subject_ = '')
+                and (find_in_set(#{param.subjectId},m.music_subject_) or m.music_subject_ is null or m.music_subject_ = '' or m.music_sheet_type_ = 'CONCERT')
             </if>
             <if test="param.subjectType != null">
                 and t.subject_type_ = #{param.subjectType}