Merge branch 'bug_fix_20221013'

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

@@ -175,6 +175,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 			if (musicSheet != null) {
 				MusicAlbumDetailSearch query = new MusicAlbumDetailSearch();
 				query.setMusicTagIds(musicSheet.getMusicTag());
+                query.setAuditVersion(musicSheet.getAuditVersion());
 				return page.setRecords(baseMapper.selectPage(page, query));
 			}
 		} else {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/AlbumDetailVo.java

@@ -15,6 +15,9 @@ import java.util.List;
  */
 public class AlbumDetailVo {
 
+    @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）")
+    private YesOrNoEnum auditVersion;
+
     @ApiModelProperty(value = "主键id")
     private Long id;
 
@@ -73,6 +76,14 @@ public class AlbumDetailVo {
     @ApiModelProperty("支付订单号")
     private String orderNo;
 
+    public YesOrNoEnum getAuditVersion() {
+        return auditVersion;
+    }
+
+    public void setAuditVersion(YesOrNoEnum auditVersion) {
+        this.auditVersion = auditVersion;
+    }
+
     public OrderStatusEnum getOrderStatus() {
         return orderStatus;
     }

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/MusicAlbumController.java

@@ -111,6 +111,7 @@ public class MusicAlbumController extends BaseController {
         MusicAlbumSearch musicAlbumSearch = new MusicAlbumSearch();
         musicAlbumSearch.setAuditVersion(YesOrNoEnum.NO);
         musicAlbumSearch.setAlbumStatus(YesOrNoEnum.YES);
+        musicAlbumSearch.setAuditVersion(albumDetailVo.getAuditVersion());
         musicAlbumSearch.setSortBy(1);
         musicAlbumSearch.setPage(1);
         musicAlbumSearch.setRows(query.getRelatedNum() +1);

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/MusicAlbumController.java

@@ -118,6 +118,7 @@ public class MusicAlbumController extends BaseController {
         MusicAlbumSearch musicAlbumSearch = new MusicAlbumSearch();
         musicAlbumSearch.setAuditVersion(YesOrNoEnum.NO);
         musicAlbumSearch.setAlbumStatus(YesOrNoEnum.YES);
+        musicAlbumSearch.setAuditVersion(albumDetailVo.getAuditVersion());
         musicAlbumSearch.setSortBy(1);
         musicAlbumSearch.setPage(1);
         musicAlbumSearch.setRows(query.getRelatedNum() +1);