wangliang пре 7 месеци
родитељ
комит
7209092587

+ 5 - 1
teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/ObeCourseRequirementReportServiceImpl.java

@@ -177,7 +177,11 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
             for (CourseRequirementMatrixDto c : courseRequirementMatrixDtoList) {
                 if (c.getCourseId().longValue() == basicCourse.getId().longValue()) {
                     List<TRBasicInfo> trBasicInfoList = trBasicInfoService.queryBasicInfoAll(obeCourseOutline.getCultureProgramId(), obeCourseOutline.getCourseId(), null, examId);
-                    TRBasicInfo trBasicInfo = !CollectionUtils.isEmpty(trBasicInfoList) ? trBasicInfoList.stream().filter(s -> Objects.nonNull(s.getTeachClassName()) && Objects.equals(s.getTeachClassName(), SystemConstant.ALL)).collect(Collectors.toList()).get(0) : null;
+                    TRBasicInfo trBasicInfo = null;
+                    if (!CollectionUtils.isEmpty(trBasicInfoList)) {
+                        List<TRBasicInfo> trBasicTempInfoList = !CollectionUtils.isEmpty(trBasicInfoList) ? trBasicInfoList.stream().filter(s -> Objects.nonNull(s.getTeachClassName()) && Objects.equals(s.getTeachClassName(), SystemConstant.ALL)).collect(Collectors.toList()) : null;
+                        trBasicInfo = !CollectionUtils.isEmpty(trBasicTempInfoList) ? trBasicTempInfoList.get(0) : trBasicInfo;
+                    }
                     if (Objects.nonNull(trBasicInfo)) {
                         ReportCourseEvaluationResultDto reportCourseEvaluationResultDto = Objects.nonNull(trBasicInfo.getCourseEvaluationResult()) ? JSONObject.parseObject(trBasicInfo.getCourseEvaluationResult(), ReportCourseEvaluationResultDto.class) : null;
                         BigDecimal courseMatrixDegree = new BigDecimal(0);