|
@@ -440,6 +440,13 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
|
|
|
|
|
|
teacherHomeVo.setUserVip(vipCardRecordService.userVipInfo(teacherHomeVo.getUserId(), ClientEnum.TEACHER));
|
|
|
|
|
|
+ // 添加乐器ID信息,由声部转为乐器
|
|
|
+ if (StringUtils.isNotBlank(teacherHomeVo.getSubjectId())) {
|
|
|
+ List<Long> subjectIds = Arrays.stream(teacherHomeVo.getSubjectId().split(",")).map(Long::parseLong).collect(Collectors.toList());
|
|
|
+ List<Subject> subjects = subjectService.findBySubjectByIdList(subjectIds);
|
|
|
+ List<String> instrumentIds = subjects.stream().map(Subject::getInstrumentId).filter(Objects::nonNull).map(String::valueOf).collect(Collectors.toList());
|
|
|
+ teacherHomeVo.setInstrumentId(String.join(",", instrumentIds));
|
|
|
+ }
|
|
|
|
|
|
if (YesOrNoEnum.YES.equals(teacher.getMusicianFlag())) {
|
|
|
teacherHomeVo.setMusicianAuthStatus(AuthStatusEnum.PASS);
|