|
@@ -403,7 +403,7 @@ public class UserController {
|
|
if ((user.getGrade() != null && !user.getGrade().isEmpty()) && user.getGrade().equals(project.getStudentGrade())) {
|
|
if ((user.getGrade() != null && !user.getGrade().isEmpty()) && user.getGrade().equals(project.getStudentGrade())) {
|
|
user.setSelectStatus(userService.getUserSelectStatus(id, project.getId()));
|
|
user.setSelectStatus(userService.getUserSelectStatus(id, project.getId()));
|
|
}
|
|
}
|
|
- if ((user.getGrade() != null && !user.getGrade().isEmpty())&&user.getUserType().equals("3")||user.getUserType().equals("5")){
|
|
|
|
|
|
+ if (project.getSupervisorIds().contains(id)&&user.getUserType().equals("3")||user.getUserType().equals("5")){
|
|
//导师学生成果要求
|
|
//导师学生成果要求
|
|
supervisorSelectionSettingDO settingDO = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(id,project.getId());
|
|
supervisorSelectionSettingDO settingDO = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(id,project.getId());
|
|
if(settingDO != null){
|
|
if(settingDO != null){
|