浏览代码

Merge remote-tracking branch 'origin/dev_v3.4.0' into dev_v3.4.0

wangliang 9 月之前
父节点
当前提交
91afa28b0a

+ 3 - 1
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/AnalyzeForReportServiceImpl.java

@@ -1626,7 +1626,9 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
         if (collegeCount > 0) {
             for (Long inspectCollegeId : inspectCollegeInfo) {
                 SysOrg college = sysOrgService.getById(inspectCollegeId);
-                inspectCollegeNames.append(college.getName()).append(SystemConstant.PAUSE_SIGN);
+                if (Objects.nonNull(college)){
+                    inspectCollegeNames.append(college.getName()).append(SystemConstant.PAUSE_SIGN);
+                }
             }
             // 考查学院名称
             inspectCollegeNames = new StringBuilder(inspectCollegeNames.substring(0, inspectCollegeNames.length() - 1));