wangliang пре 11 месеци
родитељ
комит
f89183e606

+ 3 - 1
distributed-print/src/main/java/com/qmth/distributed/print/api/TRBasicInfoController.java

@@ -140,7 +140,9 @@ public class TRBasicInfoController {
             ReportCourseEvaluationResultDto reportCourseEvaluationResultDto = Objects.nonNull(trBasicInfo.getCourseEvaluationResult()) ?
                     JSONObject.parseObject(trBasicInfo.getCourseEvaluationResult(), ReportCourseEvaluationResultDto.class) :
                     null;
-            if (Objects.nonNull(reportCourseEvaluationResultDto.getWeightSettingSign())
+            if (Objects.nonNull(reportCourseEvaluationResultDto)
+                    && Objects.nonNull(reportCourseEvaluationResultDto.getWeightSettingSign())
+                    && Objects.nonNull(obeCourseWeightResult)
                     && Objects.nonNull(obeCourseWeightResult.getWeightSettingSign())
                     && reportCourseEvaluationResultDto.getWeightSettingSign().longValue() != obeCourseWeightResult.getWeightSettingSign().longValue()) {
                 trBasicInfoService.clearReportData(cultureProgramId, courseId, paperNumber,