Merge branch 'dev_v1.3.7_20221020'

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

@@ -20,6 +20,7 @@ import com.yonge.cooleshow.biz.dal.service.CourseRelationMusicAlbumService;
 import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.wrapper.course.CourseRelationWrapper;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import org.apache.commons.collections.CollectionUtils;
 import com.yonge.cooleshow.biz.dal.dto.VideoLessonGroupDetailDto;
 import org.slf4j.Logger;
@@ -328,6 +329,7 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
                         .cover(music.getTitleImg());
                 item.setRemark(music.getComposer());
                 item.setTagIds(music.getMusicTag());
+                item.setStatus(YesOrNoEnum.YES);
             }
 
             if (RelationMusicAlbumEnum.ALBUM == item.getRelationType()
@@ -339,6 +341,7 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
                         .cover(album.getAlbumCoverUrl());
                 item.setRemark(album.getAlbumDesc());
                 item.setTagIds(album.getAlbumTag());
+                item.setStatus(album.getAlbumStatus());
             }
         }
         return musicAlbumInfos;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/course/CourseRelationWrapper.java

@@ -7,6 +7,7 @@ import com.yonge.cooleshow.biz.dal.enums.album.PurchaseRecordTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.course.CourseRelationTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.course.CourseTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.course.RelationMusicAlbumEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -74,6 +75,9 @@ public class CourseRelationWrapper {
         @ApiModelProperty("标签")
         private String tagName;
 
+        @ApiModelProperty("是否启用 0：否 1：是")
+        private YesOrNoEnum status;
+
         public MusicAlbumInfo name(String name) {
             this.name = name;
             return this;

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

@@ -99,7 +99,7 @@
     </select>
 
     <select id="selectFavoritePage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo">
-        select <include refid="Base_Column_List"/>
+        select distinct <include refid="Base_Column_List"/>
         ,(select group_concat(mt.name_) from music_tag mt
         where find_in_set(mt.id_,t.album_tag_) and mt.del_flag_ = 0 and mt.state_ = 1) as musicTagNames
         ,(select group_concat(s.name_) from subject s

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

@@ -358,7 +358,7 @@
     </select>
 
     <select id="selectMyMusicPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetVo">
-        select <include refid="Base_Column_List"/>
+        select distinct <include refid="Base_Column_List"/>
         ,su.username_ as addName
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt