|
@@ -95,10 +95,10 @@ public class supervisorSelectionSettingServiceImpl implements supervisorSelectio
|
|
|
result.getList().forEach(re->{
|
|
|
Long supervisorId = re.getSupervisorId();
|
|
|
AdminUserDO user =adminUserService.getUser(re.getSupervisorId());
|
|
|
- Integer occupiedAcademicSlots =null;
|
|
|
- Integer occupiedProfessionalSlots =null;
|
|
|
- Integer agentAcademicSlots =null;
|
|
|
- Integer agentProfessionalSlots =null;
|
|
|
+ Integer occupiedAcademicSlots =0;
|
|
|
+ Integer occupiedProfessionalSlots =0;
|
|
|
+ Integer agentAcademicSlots =0;
|
|
|
+ Integer agentProfessionalSlots =0;
|
|
|
if (user.getUserType().equals("3")){
|
|
|
occupiedAcademicSlots =adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),supervisorId,1);//占用学硕
|
|
|
occupiedProfessionalSlots =adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),supervisorId,2);//占用专硕
|