Merge branch 'master' of http://gogs.gisvg.com/YDM/graduate

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

@@ -533,7 +533,12 @@ public class StudentSelectSupervisorRecordController {
                 userSaveReqVO.setSupervisorId(updateVo.getSupervisorId());
             }
             //学生成果要求
-            supervisorSelectionSettingDO setting = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(loginId,project.getId());
+            supervisorSelectionSettingDO setting =new supervisorSelectionSettingDO();
+            if (roleIds.contains(113L)){
+                 setting = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(loginId,project.getId());
+            }else if (roleIds.contains(114L)){
+                 setting = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(updateVo.getSupervisorId(),project.getId());
+            }
             if (updateVo.getStudentAchievementRequirement()!=null&&!updateVo.getStudentAchievementRequirement().isEmpty()){
                 setting.setStudentAchievementRequirement(updateVo.getStudentAchievementRequirement());
             }