From 8874017d0a7321298ed1c24045a300b11b73953d Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 26 六月 2024 18:05:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/main/resources/mapper/QuestionMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index 074a926..02a1ed2 100644
--- a/src/main/resources/mapper/QuestionMapper.xml
+++ b/src/main/resources/mapper/QuestionMapper.xml
@@ -112,7 +112,7 @@
         FROM
              t_question tq
         WHERE
-              tq.subject_id = #{subjectId}
+              tq.subject_id = #{subjectId} AND tq.question_type = #{questionType} AND tq.deleted = 0
         ORDER BY
                  RAND()
         LIMIT #{num}

--
Gitblit v1.8.0