|
@@ -154,6 +154,9 @@ public class StudentSelectSupervisorRecordController {
|
|
|
@Operation(summary = "学院创建师生互选记录")
|
|
|
@PreAuthorize("@ss.hasPermission('system:student-select-supervisor-record:collegeCreate')")
|
|
|
public CommonResult<String> collegeCreateRecord(@Valid @RequestBody StudentSelectSupervisorRecordSaveReqVO createReqVO) {
|
|
|
+ if (createReqVO.getStudentId()==null) {
|
|
|
+ return error(1,"提交失败");
|
|
|
+ }
|
|
|
|
|
|
AdminUserDO student =adminUserService.getUser(createReqVO.getStudentId());
|
|
|
|
|
@@ -169,7 +172,7 @@ public class StudentSelectSupervisorRecordController {
|
|
|
|
|
|
Integer occupiedAcademicSlots = adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),createReqVO.getSupervisorId(), 1);//占用学硕
|
|
|
Integer occupiedProfessionalSlots = adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),createReqVO.getSupervisorId(), 2);//占用专硕
|
|
|
- supervisorSelectionSettingDO supervisorSelectionSetting = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(createReqVO.getSupervisorId(), createReqVO.getProjectId());
|
|
|
+ supervisorSelectionSettingDO supervisorSelectionSetting = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(createReqVO.getSupervisorId(), project.getId());
|
|
|
|
|
|
if (supervisorSelectionSetting == null || (supervisorSelectionSetting.getAcademicSlots() == null && supervisorSelectionSetting.getProfessionalSlots() == null)) {
|
|
|
return error(1, "该导师无名额");
|