|
@@ -375,7 +375,9 @@ public class UserController {
|
|
|
if (user.getUserType().equals("3")||user.getUserType().equals("5")){
|
|
|
//导师学生成果要求
|
|
|
supervisorSelectionSettingDO settingDO = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(id,project.getId());
|
|
|
- user.setStudentAchievementRequirement(settingDO.getStudentAchievementRequirement());
|
|
|
+ if(settingDO != null){
|
|
|
+ user.setStudentAchievementRequirement(settingDO.getStudentAchievementRequirement());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
}
|