Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -557,7 +557,16 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Override
     public List<StudentRegistration> findMusicGroupStudent(String musicGroupId, Integer actualSubjectId) {
-        return studentRegistrationDao.findMusicGroupStudent(musicGroupId, actualSubjectId);
+        List<Subject> subjectList = subjectService.findAll(new HashMap<>());
+        List<StudentRegistration> musicGroupStudents = studentRegistrationDao.findMusicGroupStudent(musicGroupId, actualSubjectId);
+        for (StudentRegistration musicGroupStudent : musicGroupStudents) {
+            for (Subject subject : subjectList) {
+                if (musicGroupStudent.getActualSubjectId().equals(subject.getId().toString())) {
+                    musicGroupStudent.setSubjectName(subject.getName());
+                }
+            }
+        }
+        return musicGroupStudents;
     }
 
     @Override