酷乐秀曲目来源改为内容平台

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetController.java

@@ -8,7 +8,6 @@ import com.microsvc.toolkit.common.response.template.R;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetOrderSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherMusicSheetSearch;
-import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.OrderTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
@@ -50,9 +49,7 @@ public class MusicSheetController extends BaseController {
     @PostMapping(value="/music/sheet/list", consumes="application/json", produces="application/json")
     @PreAuthorize("@pcs.hasPermissions('music/sheet/list')")
     public HttpResponseResult<PageInfo<MusicSheetVo>> list(@RequestBody MusicSheetSearch query) {
-        query.setAuditStatus(AuthStatusEnum.PASS);
-        IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectCbsPage(PageUtil.getPage(query), query);
-        return succeed(PageUtil.pageInfo(musicSheetVoIPage));
+        return succeed(PageUtil.pageInfo(musicSheetService.selectCbsPage(PageUtil.getPage(query), query)));
     }
 
     @ApiOperation(value = "修改应用扩展信息")

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

@@ -292,6 +292,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         if (musicSheetApplication.getIsShowFingering() != null){
             sheet.setShowFingering(musicSheetApplication.getIsShowFingering()?YesOrNoEnum.YES:YesOrNoEnum.NO);
         }
+        sheet.setMusicTagNames(musicSheetApplication.getMusicTagNames());
+        sheet.setSubjectNames(musicSheetApplication.getSubjectNames());
         sheet.setPaymentType(musicSheetApplication.getPaymentType());
         sheet.setSortNumber(musicSheetApplication.getSortNo());
         if (musicSheetApplication.getTopFlag() != null){