Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into zx_online_cbs

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

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import com.microsvc.toolkit.common.webportal.exception.BizException;
 import com.microsvc.toolkit.config.jwt.utils.JwtUserInfo;
 import com.yonge.cooleshow.biz.dal.entity.*;
@@ -318,8 +319,9 @@ public class UserMusicServiceImpl extends ServiceImpl<UserMusicMapper, UserMusic
         }
 
         // 声部ID集合
-        List<String> subjectIds = records.stream().map(UserMusicWrapper.UserMusic::getSubjectId)
+        List<String> subjectIds = records.stream().flatMap(o-> Lists.newArrayList(o.getSubjectId(),o.getMusicSheetSubjectId()).stream())
             .filter(o -> !StringUtil.isEmpty(o))
+            .flatMap(o -> Arrays.stream(o.split(",")))
             .distinct().collect(Collectors.toList());
 
         Map<Integer, Subject> subjectMap =
@@ -343,10 +345,13 @@ public class UserMusicServiceImpl extends ServiceImpl<UserMusicMapper, UserMusic
             if (StringUtil.isEmpty(record.getMusicSheetSubjectId())) {
                 continue;
             }
-            Subject subject = subjectMap.get(Integer.parseInt(record.getMusicSheetSubjectId()));
-            if (subject != null) {
-                record.setMusicSheetSubjectName(subject.getName());
-            }
+            String subjectName = Arrays.stream(record.getMusicSheetSubjectId().split(",")) // 1,2,3
+                .map(Integer::parseInt)
+                .map(subjectMap::get)
+                .filter(Objects::nonNull)
+                .map(Subject::getName)
+                .collect(Collectors.joining(","));
+            record.setMusicSheetSubjectName(subjectName);
         }