Merge branch 'feature/0721-tenant'

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

@@ -94,6 +94,18 @@ public class MusicSheetSearch  extends QueryInfo{
     @ApiModelProperty("数据修复标识")
     private Boolean DataCorrect;
 
+
+    @ApiModelProperty("musicSheetId集合")
+    private List<Long> musicSheetIdlist;
+
+    public List<Long> getMusicSheetIdlist() {
+        return musicSheetIdlist;
+    }
+
+    public void setMusicSheetIdlist(List<Long> musicSheetIdlist) {
+        this.musicSheetIdlist = musicSheetIdlist;
+    }
+
     public MusicSortType getMusicSortType() {
         return musicSortType;
     }

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

@@ -41,8 +41,6 @@ public class StudentMusicSheetSearch  extends MusicSheetSearch{
     @ApiModelProperty(value = "平台")
     private String platform;
 
-    @ApiModelProperty("musicSheetId集合")
-    List<Long> musicSheetIdlist;
 
     // 客户端类型
     private ClientEnum clientType;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/TenantAlbumMusicMapper.java

@@ -26,5 +26,5 @@ public interface TenantAlbumMusicMapper extends BaseMapper<TenantAlbumMusic> {
 	 */
 	List<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> selectPage(@Param("page") IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> page, @Param("param") TenantAlbumMusicWrapper.StudentMusicSheetQuery param);
 
-	List<Long> selectMusicSheetIds(@Param("albumIds") List<Long> albumIds, @Param("subjectType") SubjectTypeEnum subjectType, @Param("type") String type, @Param("level") String level);
+	List<Long> selectMusicSheetIds(@Param("albumIds") List<Long> albumIds, @Param("subjectType") String s, @Param("type") String type, @Param("level") String level);
 }

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

@@ -71,10 +71,11 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
     public IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> selectPage(IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> page, TenantAlbumMusicWrapper.StudentTenantAlbumMusicQuery query) {
         List<Long> albumIds = query.getAlbumIds();
         SubjectTypeEnum subjectType = query.getSubjectType();
+        String s = subjectType.toString();
         String type = query.getType();
         String level = query.getLevel();
 
-        List<Long> musicSheetIds = tenantAlbumMusicMapper.selectMusicSheetIds(albumIds, subjectType, type, level);
+        List<Long> musicSheetIds = tenantAlbumMusicMapper.selectMusicSheetIds(albumIds, s, type, level);
 
         TenantAlbumMusicWrapper.StudentMusicSheetQuery musicSheetQuery = new TenantAlbumMusicWrapper.StudentMusicSheetQuery();
         musicSheetQuery.setMusicSheetIds(musicSheetIds);
@@ -83,8 +84,7 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         List<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> musicSheets = tenantAlbumMusicMapper.selectPage(page, musicSheetQuery);
 
 
-
-        return page.setRecords(baseMapper.selectPage(page, musicSheetQuery));
+        return page.setRecords(musicSheets);
     }
 
     /**