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