diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/autoTools/AutoToolsController.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/autoTools/AutoToolsController.java
index 6f4bb393..884f534f 100644
--- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/autoTools/AutoToolsController.java
+++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/autoTools/AutoToolsController.java
@@ -31,6 +31,10 @@ import pc.exam.pp.module.judgement.service.wps_word.JudgementWpsWordService;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * @author REN
@@ -64,11 +68,17 @@ public class AutoToolsController {
         stuPaperScoreInfoVos.setStuPaperScoreDOList(stuPaperScoreService.findByStuIDAndPaperId(stuPaperReqVo.getStuId(),stuPaperReqVo.getPaperId()));
         // 4、查询学生试卷内容信息
         List<String> quIds = educationPaperQuMapper.selectPaperQuByPaperId(stuPaperReqVo.getPaperId());
-        List<ExamQuestion> examQuestionList = new ArrayList<>();
+        List<ExamQuestion> examQuestionList = examQuestionMapper.selectExamQuestionListByQuIds(quIds);
+        Map<String, ExamQuestion> questionMap = examQuestionList.stream()
+                .collect(Collectors.toMap(ExamQuestion::getQuId, Function.identity()));
+        examQuestionList = quIds.stream()
+                .map(questionMap::get)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
         // 一条一条进行查询试题，防止顺序错乱
-        for (String quId : quIds) {
-            examQuestionList.add(examQuestionMapper.selectExamQuestionByQuId(quId));
-        }
+//        for (String quId : quIds) {
+//            examQuestionList.add(examQuestionMapper.selectExamQuestionByQuId(quId));
+//        }
         stuPaperScoreInfoVos.setExamQuestionList(examQuestionList);
         // 5、查询学生试卷分析
         List<StuPaperScoreDO> scoreDOS = stuPaperScoreService.findByStuIDAndPaperId(stuPaperReqVo.getStuId(),stuPaperReqVo.getPaperId());