From b792f585a481eebd5b48f4ec01e4d9424c3ed9a0 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Mon, 8 Aug 2022 16:49:23 +0800
Subject: [PATCH] feat: There is no way the,

---
 .../mybatis/mapper/askQuestions/AskQuestionsMapper.xml   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml
index bf96e138..3873c0b7 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml
@@ -140,7 +140,7 @@
         LEFT JOIN reply ON aq.ID = reply.ASK_ID
         LEFT JOIN ts_user t1 ON t1.USID = aq.QUESTIONER
         LEFT JOIN ts_user t2 ON t2.USID = reply.ANSWERER
-        LEFT JOIN subscription su ON su.ASK_ID = aq.ID
+        LEFT JOIN subscription su ON su.ASK_ID = aq.ID and su.SUB_STATE = 'y'
         <where>
             <if test="askQuestions.answerer !=null and askQuestions.answerer !=''">
                 AND su.USID = #{askQuestions.answerer}
@@ -172,7 +172,10 @@
         <if test="askQuestions.type == 'mySub'">
             LEFT JOIN subscription su ON su.ASK_ID = aq.ID
         </if>
-        <where>
+        <where> 1=1
+            <if test="askQuestions.type == 'mySub'">
+                AND su.SUB_STATE = 'y'
+            </if>
             <if test="askQuestions.questioner != null and askQuestions.questioner != ''">
                 AND aq.QUESTIONER =#{askQuestions.questioner}
             </if>
@@ -214,7 +217,7 @@
         LEFT JOIN reply ON aq.ID = reply.ASK_ID AND reply.STATE = '0'
         LEFT JOIN ts_user t1 ON t1.USID = aq.QUESTIONER
         LEFT JOIN ts_user t2 ON t2.USID = reply.ANSWERER
-        LEFT JOIN subscription su ON su.ASK_ID = aq.ID
+        LEFT JOIN subscription su ON su.ASK_ID = aq.ID and su.SUB_STATE = 'y'
         <where>
             <if test="askQuestions.answerer !=null and askQuestions.answerer !=''">
                 AND su.USID = #{askQuestions.answerer}