|
@@ -911,15 +911,16 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
for (Subject subject : subjectList) {
|
|
for (Subject subject : subjectList) {
|
|
if (student.getActualSubjectId().equals(subject.getId())) {
|
|
if (student.getActualSubjectId().equals(subject.getId())) {
|
|
student.setSubjectName(subject.getName());
|
|
student.setSubjectName(subject.getName());
|
|
|
|
+ break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (type.equals(ClassGroupTypeEnum.SNAP)) continue;
|
|
if (type.equals(ClassGroupTypeEnum.SNAP)) continue;
|
|
for (ClassGroupStudentMapper classGroupStudentMapper : classGroupStudentMappers) {
|
|
for (ClassGroupStudentMapper classGroupStudentMapper : classGroupStudentMappers) {
|
|
if (student.getUserId().equals(classGroupStudentMapper.getUserId())) {
|
|
if (student.getUserId().equals(classGroupStudentMapper.getUserId())) {
|
|
iterator.remove();
|
|
iterator.remove();
|
|
|
|
+ break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
}
|
|
}
|
|
return students;
|
|
return students;
|
|
}
|
|
}
|