Explorar el Código

1.11,部分

Crazy hace 4 meses
padre
commit
230957de21

+ 13 - 3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supervisorSelectionSetting/supervisorSelectionSettingServiceImpl.java

@@ -99,9 +99,19 @@ public class supervisorSelectionSettingServiceImpl implements supervisorSelectio
             re.setOccupiedAcademicSlots(occupiedAcademicSlots);
             re.setOccupiedProfessionalSlots(occupiedProfessionalSlots);
             if (roleIds.contains(112L)){
-                studentSelectSupervisorRecordDO record = studentSelectSupervisorRecordService.getRecordByStudentIdAndSupervisorId(pageReqVO.getProjectId(),loginId, Long.valueOf(supervisorId),1);//待处理的
-                if (record!=null){
-                    re.setSelectType(1);
+                studentSelectSupervisorRecordDO record1 = studentSelectSupervisorRecordService.getRecordByStudentIdAndSupervisorId(pageReqVO.getProjectId(),loginId,supervisorId,1);//待处理的
+                studentSelectSupervisorRecordDO record2 = studentSelectSupervisorRecordService.getRecordByStudentIdAndSupervisorId(pageReqVO.getProjectId(),loginId,supervisorId,2);//同意的
+                studentSelectSupervisorRecordDO record3 = studentSelectSupervisorRecordService.getRecordByStudentIdAndSupervisorId(pageReqVO.getProjectId(),loginId,supervisorId,4);//学院编辑的
+                studentSelectSupervisorRecordDO record = null; // 初始化record为null
+                if (record1 != null) {
+                    record = record1;
+                } else if (record2 != null) {
+                    record = record2;
+                } else if (record3 != null) {
+                    record = record3;
+                }
+                if (record != null) {
+                    re.setSelectType(record.getSelectType());
                 }
             }
         });