|  | @@ -1593,6 +1593,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 | 
	
		
			
				|  |  |      public List<HighClassGroupDto> findClassGroupByMusicGroupIdAndSubjectId(String musicGroupId, Integer subjectId) {
 | 
	
		
			
				|  |  |          List<HighClassGroupDto> highClassGroupList = classGroupDao.findClassGroupByMusicGroupIdAndSubjectId(musicGroupId, subjectId);
 | 
	
		
			
				|  |  |          for (HighClassGroupDto highClassGroup : highClassGroupList) {
 | 
	
		
			
				|  |  | +            List<String> subjects = subjectService.findBySubIds(highClassGroup.getSubjectIdList());
 | 
	
		
			
				|  |  | +            highClassGroup.setSubjectName(subjects.stream().collect(Collectors.joining(",")));
 | 
	
		
			
				|  |  |              ClassGroupTeacherMapper bishopTeacher = classGroupTeacherMapperDao.findByClassGroupAndRole(highClassGroup.getId().longValue(), TeachTypeEnum.BISHOP);
 | 
	
		
			
				|  |  |              highClassGroup.setTeacherName(bishopTeacher.getUserName());
 | 
	
		
			
				|  |  |              CourseSchedule courseSchedule = courseScheduleDao.findOneCourseScheduleByClassGroupId(highClassGroup.getId());
 |