diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperServiceImpl.java
index 3edbf0bc..999d344e 100644
--- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperServiceImpl.java
+++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperServiceImpl.java
@@ -262,7 +262,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, PaperDO> implemen
         for (int i = 0; i < questions.size(); i++) {
             PaperQuestionRelDO rel = new PaperQuestionRelDO();
             rel.setPaperId(paper.getId());
-            rel.setQuestionId(questions.get(0).getId());
+            rel.setQuestionId(questions.get(i).getId());
             rel.setQuestionNum(i + 1);
             InsertFieldDefaults.applyIgnoreOrgId(rel);
             rels.add(rel);
diff --git a/safety-cedu-service/src/main/resources/mapper/QuestionMapper.xml b/safety-cedu-service/src/main/resources/mapper/QuestionMapper.xml
index f9c6ee42..5d50cea6 100644
--- a/safety-cedu-service/src/main/resources/mapper/QuestionMapper.xml
+++ b/safety-cedu-service/src/main/resources/mapper/QuestionMapper.xml
@@ -18,6 +18,6 @@
         <if test="query.questionType != null and query.questionType != ''">
             AND q.question_type = #{query.questionType}
         </if>
-        ORDER BY q.id DESC
+        ORDER BY  pqr.question_num ASC
     </select>
 </mapper>