Crazy 3 mesi fa
parent
commit
de38fbe3bb

+ 4 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentSelectSupervisorRecord/StudentSelectSupervisorRecordController.java

@@ -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, "该导师无名额");

+ 0 - 3
yudao-module-system/yudao-module-system-biz/src/main/resources/Mapper/studentSelectSupervisorRecord/studentSelectSupervisorRecordMapper.xml

@@ -119,9 +119,6 @@
             <if test="recordDO.supervisorId != null">
                 supervisor_id = #{recordDO.supervisorId},
             </if>
-            <if test="recordDO.externalSupervisorId != null">
-                external_supervisor_id = #{recordDO.externalSupervisorId},
-            </if>
             <if test="recordDO.selectType != null">
                 select_type = #{recordDO.selectType},
             </if>

BIN
yudao-module-system/yudao-module-system-biz/src/main/resources/font/STXIHEI.TTF