bug修复

web/src/main/java/com/ynfy/buss/exam/exam/service/impl/ExamServiceImpl.java

@@ -296,8 +296,11 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements IE
      */
     public Map<String, PaperRuleGroup> getGroupMap(List<PaperQuestion> paperQuestionList) {
         List<String> groupIdList = paperQuestionList.stream().map(PaperQuestion::getGroupId).collect(Collectors.toList());
-        List<PaperRuleGroup> groupList = paperRuleGroupService.listByIds(groupIdList);
-        return groupList.stream().collect(Collectors.toMap(PaperRuleGroup::getId, a -> a, (k1, k2) -> k1));
+        if (!CollectionUtils.isEmpty(groupIdList)) {
+            List<PaperRuleGroup> groupList = paperRuleGroupService.listByIds(groupIdList);
+            return groupList.stream().collect(Collectors.toMap(PaperRuleGroup::getId, a -> a, (k1, k2) -> k1));
+        }
+        return null;
     }
 
     /**
@@ -734,7 +737,10 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements IE
 
         List<String> combinationIdList = rootExamQuestionList.stream().filter(o -> o.getQuestionType()
                 .equals(QuestionType.COMBINATION.getCode())).map(UserExamQuestion::getQuestionId).collect(toList());
-        List<Question> combinationQuestionList = questionService.listByIds(combinationIdList);
+        List<Question> combinationQuestionList = null;
+        if (!CollectionUtils.isEmpty(combinationIdList)) {
+            combinationQuestionList = questionService.listByIds(combinationIdList);
+        }
         if (!CollectionUtils.isEmpty(questionList)) {
             resultList.addAll(questionList);
         }

web/src/main/java/com/ynfy/buss/practice/userpractice/service/impl/UserPracticeServiceImpl.java

@@ -128,7 +128,10 @@ public class UserPracticeServiceImpl extends ServiceImpl<UserPracticeMapper, Use
         dto.setUserPractice(userPractice);
         List<UserPracticeQuestion> userPracticeQuestionList = userPracticeQuestionService.listByUserPracticeId(id);
         List<String> questionIdList = userPracticeQuestionList.stream().map(UserPracticeQuestion::getQuestionId).collect(Collectors.toList());
-        List<Question> questionList = questionService.listByIds(questionIdList);
+        List<Question> questionList = null;
+        if (!CollectionUtils.isEmpty(questionIdList)) {
+            questionList = questionService.listByIds(questionIdList);
+        }
         questionService.setQuestionAnswer(questionList);
         Map<String, Question> questionMap = questionList.stream().collect(Collectors.toMap(Question::getId, a -> a, (k1, k2) -> k1));
         for (UserPracticeQuestion userPracticeQuestion : userPracticeQuestionList) {