字体

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java

@@ -344,7 +344,8 @@ public class MailTemplateController {
                     }
 
                     PDFont font = PDType0Font.load(document, getClass().getResourceAsStream("/font/STXIHEI.TTF"));
-                // 使用第一个流写标题
+
+                    // 使用第一个流写标题
                     PDPageContentStream contentStream = contentStreams.get(0);
                     // 页面宽度与高度
                     float pageWidth = page.getMediaBox().getWidth();

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentSelectionProject/studentSelectionProjectController.java

@@ -175,6 +175,9 @@ public class studentSelectionProjectController {
         // 更新已有的导师（名额发生变化的导师）
         for (supervisorSelectionSettingDO supervisor : originSupervisors) {
 
+            Integer  occupiedAcademicSlots =adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),supervisor.getSupervisorId(),1);//占用学硕
+            Integer  occupiedProfessionalSlots =adminUserService.countStudentListBySupervisorId(project.getStudentGrade(),supervisor.getSupervisorId(),2);//占用专硕
+
             supervisorSelectionSettingSaveReqVO settingSaveReqVO = new supervisorSelectionSettingSaveReqVO();
             settingSaveReqVO.setId(supervisor.getId());
             settingSaveReqVO.setSupervisorId(supervisor.getSupervisorId());
@@ -182,7 +185,14 @@ public class studentSelectionProjectController {
 
             // 根据 request 中的名额信息设置名额
             Map<String, String> supervisorQuota = findSupervisorQuotaById(updateReqVO.getSupervisorsWithQuota(), supervisor.getSupervisorId());
+
             if (supervisorQuota != null) {
+                if (Integer.parseInt(supervisorQuota.get("academicSlots"))<occupiedAcademicSlots){
+                    continue;
+                }
+                if (Integer.parseInt(supervisorQuota.get("professionalSlots"))<occupiedProfessionalSlots){
+                    continue;
+                }
                 settingSaveReqVO.setAcademicSlots(Integer.valueOf(supervisorQuota.get("academicSlots")));
                 settingSaveReqVO.setProfessionalSlots(Integer.valueOf(supervisorQuota.get("professionalSlots")));
                 supervisorSelectionSettingService.updateSupervisorSelectionSetting(settingSaveReqVO);