Browse Source

fix:代码调整

caozixuan 1 year ago
parent
commit
ff6411e2b4

+ 7 - 2
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/GradeBatchPaperServiceImpl.java

@@ -68,8 +68,10 @@ public class GradeBatchPaperServiceImpl extends ServiceImpl<GradeBatchPaperMappe
         for (GradeBatchPaperResult record : datasource.getRecords()) {
             Long teachingRoomId = record.getTeachingRoomId();
             SysOrg teachCollege = sysOrgService.findCollegeLevelOrgByOrgId(teachingRoomId);
-            record.setTeachCollegeId(teachCollege.getId());
-            record.setTeachCollegeName(teachCollege.getName());
+            if (Objects.nonNull(teachCollege)){
+                record.setTeachCollegeId(teachCollege.getId());
+                record.setTeachCollegeName(teachCollege.getName());
+            }
         }
         return datasource;
     }
@@ -352,6 +354,9 @@ public class GradeBatchPaperServiceImpl extends ServiceImpl<GradeBatchPaperMappe
         Map<Long, Long> keyMap = new HashMap<>();
         for (Long orgId : teachingRoomIdList) {
             SysOrg sysOrg = sysOrgService.findCollegeLevelOrgByOrgId(orgId);
+            if (Objects.isNull(sysOrg)){
+                continue;
+            }
             Long id = sysOrg.getId();
             if (!keyMap.containsKey(id)) {
                 teachOrgList.add(sysOrg);