1.10

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

@@ -194,9 +194,29 @@ public class StudentSelectSupervisorRecordController {
             } else if (record2 != null) {
                 return error(1, "还有请求在待处理中");
             }
+            //更新志愿
+            UserSaveReqVO saveReqVO = new UserSaveReqVO();
+            saveReqVO.setId(createReqVO.getStudentId());
+
+    //            设置导师id和校外导师id
+            if (createReqVO.getSupervisorId() != null) {
+                AdminUserDO supervisor = adminUserService.getUser(createReqVO.getSupervisorId());
+                if (supervisor != null) {
+                    if (supervisor.getUserType().equals("3")) { //如果是校内导师
+                        saveReqVO.setSupervisorId(createReqVO.getSupervisorId());
+                    } else if (supervisor.getUserType().equals("5")) {//如果是校外导师
+                        saveReqVO.setExternalSupervisorId(createReqVO.getSupervisorId());
+                        //还要添加校内导师的id(直接就是校外导师的合作导师)
+                        if (supervisor.getSupervisorId() != null && supervisor.getSupervisorId() != 0) {
+                            saveReqVO.setSupervisorId(supervisor.getSupervisorId());
+                        }
+                    }
+                }
+            }
             createReqVO.setProjectId(project.getId());
             createReqVO.setSelectType(2);//同意
 
+            adminUserService.updateUser(saveReqVO);
             studentSelectSupervisorRecordService.createStudentSelectSupervisorRecord(createReqVO);
         return success("请求提交成功");
     }