From 18d1f4bc4f4f77c8883702a00896dd99469db648 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 八月 2023 16:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/user/UserQuestionAnswerV1ServiceDaoImplMapper.xml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/UserQuestionAnswerV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/UserQuestionAnswerV1ServiceDaoImplMapper.xml
index b8edb06..40d77c9 100644
--- a/java110-db/src/main/resources/mapper/user/UserQuestionAnswerV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/UserQuestionAnswerV1ServiceDaoImplMapper.xml
@@ -167,7 +167,12 @@
             and t.status_cd = '0'
             and t.community_id = #{communityId}
             and t.link = #{link}
-            and qa.qa_type = #{qaType}
+            <if test="state != null and state != ''">
+                and t.state = #{state}
+            </if>
+            <if test="qaType != null and qaType != ''">
+                and qa.qa_type = #{qaType}
+            </if>
             and qa.state = 'C'
             and qa.start_time &lt; NOW()
             and qa.end_time &gt; NOW()

--
Gitblit v1.8.0