|  | @@ -1459,7 +1459,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 | 
											
												
													
														|  |          List<ClassGroup> classGroupList = classGroupDao.findClassGroupByMusicGroupIdAndType(musicGroupId, ClassGroupTypeEnum.HIGH);
 |  |          List<ClassGroup> classGroupList = classGroupDao.findClassGroupByMusicGroupIdAndType(musicGroupId, ClassGroupTypeEnum.HIGH);
 | 
											
												
													
														|  |          for (ClassGroup classGroup : classGroupList) {
 |  |          for (ClassGroup classGroup : classGroupList) {
 | 
											
												
													
														|  |              for (Subject subject : subjectList) {
 |  |              for (Subject subject : subjectList) {
 | 
											
												
													
														|  | -                if (classGroup.getSubjectIdList().equals(subject.getId())) {
 |  | 
 | 
											
												
													
														|  | 
 |  | +                if (classGroup.getSubjectIdList().equals(subject.getId().toString())) {
 | 
											
												
													
														|  |                      classGroup.setSubjectName(subject.getName());
 |  |                      classGroup.setSubjectName(subject.getName());
 | 
											
												
													
														|  |                  }
 |  |                  }
 | 
											
												
													
														|  |              }
 |  |              }
 |