Merge branch 'feature/0904_music' into test

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

@@ -64,6 +64,12 @@ public class MusicSheetController extends BaseController {
     @PostMapping(value="/list", consumes="application/json", produces="application/json")
     @PreAuthorize("@pcs.hasPermissions('music/sheet/list')")
     public HttpResponseResult<PageInfo<MusicSheetVoResult>> list(@RequestBody MusicSheetSearch query) {
+        if (query.getProviderType() == SourceTypeEnum.TENANT && query.getMusicCategoryId() !=null) {
+
+            List<Integer> integers = musicFeignClientService.getAllCategoryIdList(String.valueOf(query.getMusicCategoryId())).feignData();
+            integers.add(query.getMusicCategoryId());
+            query.setTenantCategoryIds(integers);
+        }
         return succeed(PageUtil.pageInfo(musicSheetService.selectCbsPage(PageUtil.getPage(query), query)));
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicSheetSearch.java

@@ -126,6 +126,8 @@ public class MusicSheetSearch  extends QueryInfo{
     @ApiModelProperty("机构专辑分类")
     private String subjectType;
 
+    @ApiModelProperty("机构分类id")
+    private Integer musicCategoryId;
 
     @ApiModelProperty("机构专辑分类")
     private List<Integer> tenantCategoryIds;