1.专辑分类适配学生端专辑查询条件

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

@@ -11,6 +11,7 @@ import com.yonge.cooleshow.biz.dal.entity.MusicTag;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.TenantAlbumCategory;
+import com.yonge.cooleshow.biz.dal.entity.TenantAlbumCategoryDetail;
 import com.yonge.cooleshow.biz.dal.entity.TenantAlbumMusic;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.SubjectTypeEnum;
@@ -20,6 +21,7 @@ import com.yonge.cooleshow.biz.dal.service.MusicFavoriteService;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.service.MusicTagService;
 import com.yonge.cooleshow.biz.dal.service.SubjectService;
+import com.yonge.cooleshow.biz.dal.service.TenantAlbumCategoryDetailService;
 import com.yonge.cooleshow.biz.dal.service.TenantAlbumCategoryService;
 import com.yonge.cooleshow.biz.dal.service.TenantAlbumMusicService;
 import com.yonge.cooleshow.biz.dal.service.UserTenantAlbumRecordService;
@@ -79,7 +81,7 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
     private  SysUserFeignService sysUserFeignService;
 
     @Autowired
-    private TenantAlbumCategoryService tenantAlbumCategoryService;
+    private TenantAlbumCategoryDetailService tenantAlbumCategoryDetailService;
 
     /**
      * 查询详情
@@ -235,8 +237,8 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         List<Long> typeIds =list.stream().map(TenantAlbumMusic::getType).distinct().filter(StringUtils::isNotBlank)
                 .filter(NumberUtil::isNumber).map(Long::valueOf).collect(Collectors.toList());
         if (!typeIds.isEmpty()) {
-            List<String> typeNameList = tenantAlbumCategoryService.listByIds(typeIds).stream()
-                    .map(TenantAlbumCategory::getName).collect(Collectors.toList());
+            List<String> typeNameList = tenantAlbumCategoryDetailService.listByIds(typeIds).stream()
+                    .map(TenantAlbumCategoryDetail::getValue).collect(Collectors.toList());
             data.setTypes(typeNameList);
         } else {
             data.setTypes(new ArrayList<>());
@@ -245,8 +247,8 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         List<Long> levelIds =list.stream().map(TenantAlbumMusic::getLevel).distinct().filter(StringUtils::isNotBlank)
                 .filter(NumberUtil::isNumber).map(Long::valueOf).collect(Collectors.toList());
         if (!typeIds.isEmpty()) {
-            List<String> levelNameList = tenantAlbumCategoryService.listByIds(levelIds).stream()
-                    .map(TenantAlbumCategory::getName).collect(Collectors.toList());
+            List<String> levelNameList = tenantAlbumCategoryDetailService.listByIds(levelIds).stream()
+                    .map(TenantAlbumCategoryDetail::getValue).collect(Collectors.toList());
             data.setLevels(levelNameList);
         } else {
             data.setLevels(new ArrayList<>());