From a5c2a3b99f46866a666618bc461340aa4e679b1c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 31 Jan 2024 11:36:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/subjectChoices/mapper/SubjectChoicesMapper.xml |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/subjectChoices/mapper/SubjectChoicesMapper.xml b/src/main/java/org/springblade/modules/subjectChoices/mapper/SubjectChoicesMapper.xml
index bce9a7b..c66cc6b 100644
--- a/src/main/java/org/springblade/modules/subjectChoices/mapper/SubjectChoicesMapper.xml
+++ b/src/main/java/org/springblade/modules/subjectChoices/mapper/SubjectChoicesMapper.xml
@@ -30,9 +30,15 @@
     </resultMap>
 
     <select id="selectCircleCommentByParentId" parameterType="long"
-            resultType="org.springblade.modules.subjectOption.entity.SubjectOptionEntity">
-       select * from jczz_subject_option where
-        subject_choices_id = #{id}
+            resultType="org.springblade.modules.subjectOption.vo.SubjectOptionVO">
+        SELECT
+        jso.*,
+        jar.subject_option_id ids,
+        jar.answer numbers
+        FROM
+        jczz_subject_option jso LEFT JOIN jczz_answer_record jar on jso.id = jar.subject_option_id
+        WHERE
+        jso.subject_choices_id = #{id}
     </select>
 
 

--
Gitblit v1.9.3