|
@@ -237,9 +237,12 @@ 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 = tenantAlbumCategoryDetailService.listByIds(typeIds).stream()
|
|
|
+ List<TenantAlbumCategoryDetail> typeList = tenantAlbumCategoryDetailService.lambdaQuery()
|
|
|
+ .in(TenantAlbumCategoryDetail::getId, typeIds).list();
|
|
|
+ List<String> typeNameList = typeList.stream()
|
|
|
.map(TenantAlbumCategoryDetail::getValue).collect(Collectors.toList());
|
|
|
data.setTypes(typeNameList);
|
|
|
+ data.setTypeList(typeList);
|
|
|
} else {
|
|
|
data.setTypes(new ArrayList<>());
|
|
|
}
|
|
@@ -247,9 +250,12 @@ 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 = tenantAlbumCategoryDetailService.listByIds(levelIds).stream()
|
|
|
+ List<TenantAlbumCategoryDetail> levelList = tenantAlbumCategoryDetailService.lambdaQuery()
|
|
|
+ .in(TenantAlbumCategoryDetail::getId, levelIds).list();
|
|
|
+ List<String> levelNameList = levelList.stream()
|
|
|
.map(TenantAlbumCategoryDetail::getValue).collect(Collectors.toList());
|
|
|
data.setLevels(levelNameList);
|
|
|
+ data.setLevelList(levelList);
|
|
|
} else {
|
|
|
data.setLevels(new ArrayList<>());
|
|
|
}
|