diff --git a/server/src/main/java/ru/mskobaro/tdms/business/service/ParticipantService.java b/server/src/main/java/ru/mskobaro/tdms/business/service/ParticipantService.java index b3db1d4..825cb37 100644 --- a/server/src/main/java/ru/mskobaro/tdms/business/service/ParticipantService.java +++ b/server/src/main/java/ru/mskobaro/tdms/business/service/ParticipantService.java @@ -234,13 +234,6 @@ public class ParticipantService { studentData = new StudentData(); } - if (participantSaveDTO.getStudentData().getCuratorId() != null) { - TeacherData teacherData = teacherDataRepository.findByIdThrow(participantSaveDTO.getStudentData().getCuratorId()); - studentData.setCurator(teacherData); - } else { - studentData.setCurator(null); - } - studentData.setOtziv(participantSaveDTO.getStudentData().getOtziv()); studentData.setWork(participantSaveDTO.getStudentData().getWork()); studentData.setZachetka(participantSaveDTO.getStudentData().getZachetka()); @@ -271,6 +264,13 @@ public class ParticipantService { studentData.setGroup(null); } + if (participantSaveDTO.getStudentData().getCuratorId() != null) { + TeacherData teacherData = teacherDataRepository.findByIdThrow(participantSaveDTO.getStudentData().getCuratorId()); + studentData.setCurator(teacherData); + } else { + studentData.setCurator(null); + } + return studentData; }