From 06e9c0a3e76f1bee4f87cc4ad26c670a805be835 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Tue, 11 Apr 2023 10:47:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E7=AD=94=E4=B8=AD=E5=BF=83=20?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=9B=9E=E5=A1=AB=E6=8F=90=E9=97=AE=E5=92=8C?=
 =?UTF-8?q?=E5=9B=9E=E7=AD=94=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/slrs/StandardQA/dao/AskQuestionsDao.java |  2 +-
 .../service/impl/AskQuestionsServiceImpl.java   |  2 +-
 .../mapper/askQuestions/AskQuestionsMapper.xml  | 17 ++---------------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java
index 274b3687..b64a2c09 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java
@@ -40,7 +40,7 @@ public interface AskQuestionsDao extends BaseMapper<AskQuestions> {
 
     List<String> getUId();
 
-    String selectByRId(@Param("id") String id);
+    String selectByRId(@Param("id") String id,@Param("userId") String userId);
 
     String selectBYAQId(@Param("id") String id);
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java
index 3318b90e..d8e791c7 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java
@@ -120,7 +120,7 @@ public class AskQuestionsServiceImpl extends ServiceImpl<AskQuestionsDao, AskQue
     @Override
     public List<Reply> getAskQuestionsByakId(String id,String state,String userId) {
         String questioner = askQuestionsDao.selectBYAQId(id);
-        String answerer = askQuestionsDao.selectByRId(id);
+        String answerer = askQuestionsDao.selectByRId(id,userId);
         if (userId.equals(questioner)||userId.equals(answerer)){
             return  askQuestionsDao.getAskQuestionsByakId(id,state);
         }
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 e22df6f4..a04ccabd 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
@@ -269,26 +269,13 @@
     <select id="selectByRId" resultType="java.lang.String">
         SELECT reply.ANSWERER
         FROM reply
-        LEFT JOIN ts_user t2 ON t2.USID = reply.ANSWERER
-        <where>
-            <if test="id != null and id !=''">
-                AND reply.ASK_ID = #{id}
-            </if>
-                limit 1
-        </where>
+        where ASK_ID = #{id} and answerer = #{userId};
     </select>
 
     <select id="selectBYAQId" resultType="java.lang.String">
         SELECT ask_questions.QUESTIONER
         FROM ask_questions
-        LEFT JOIN ts_user t2 ON t2.USID = ask_questions.QUESTIONER
-        left join reply on reply.ASK_ID = ask_questions.ID
-        <where>
-            <if test="id != null and id !=''">
-                AND reply.ASK_ID = #{id}
-            </if>
-                limit 1
-        </where>
+        where id = #{id}
     </select>
 
     <select id="getAskQuestionsById" resultType="com.adc.da.slrs.StandardQA.entity.Reply">