bugFix 解决固定考题中课程主题为空导致提示题目数量不够的问题

rw-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/TrainingExamPaperServiceImpl.java

@@ -58,10 +58,14 @@ public class TrainingExamPaperServiceImpl extends ServiceImpl<ExamPaperDao, Exam
             return R.ok();
         }
         // 存放考题类型和所需要的题目数量
-        Map<String, Long> subjectTypeAndNum = paperSubjectAutoDos.stream().collect(Collectors.groupingBy(info -> info.getSubjecttype(),
+        Map<String, Long> subjectTypeAndNum = paperSubjectAutoDos.stream()
+                .filter(info->StringUtils.isNotBlank(info.getCoursethemeid()))
+                .collect(Collectors.groupingBy(info -> info.getSubjecttype(),
                 Collectors.summingLong(PaperSubjectAutoDo::getThemesubjectnum)));
         if (paperSubjectAssignDos != null && !paperSubjectAssignDos.isEmpty()) {
-            Map<String, Long> collect = paperSubjectAssignDos.stream().collect(Collectors.groupingBy(info -> info.getSubjecttype(),
+            Map<String, Long> collect = paperSubjectAssignDos.stream()
+                    .filter(info->StringUtils.isNotBlank(info.getCourseid()))
+                    .collect(Collectors.groupingBy(info -> info.getSubjecttype(),
                     Collectors.counting()));
             collect.forEach((key, value) -> subjectTypeAndNum.merge(key, value, (prev, one) -> prev + one));
         }