Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java

@@ -122,7 +122,7 @@ public class AskQuestionsServiceImpl extends ServiceImpl<AskQuestionsDao, AskQue
         String questioner = askQuestionsDao.selectBYAQId(id);
         String answerer = askQuestionsDao.selectByRId(id,userId);
         if (userId.equals(questioner)||userId.equals(answerer)){
-            return  askQuestionsDao.getAskQuestionsByakId(id,state);
+            return  askQuestionsDao.getAskQuestionsByakId(id,null);
         }
         return askQuestionsDao.getAskQuestionsById(id);
     }

adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml

@@ -269,13 +269,13 @@
     <select id="selectByRId" resultType="java.lang.String">
         SELECT reply.ANSWERER
         FROM reply
-        where ASK_ID = #{id} and answerer = #{userId};
+        where ASK_ID = #{id} and answerer = #{userId} limit 1;
     </select>
 
     <select id="selectBYAQId" resultType="java.lang.String">
         SELECT ask_questions.QUESTIONER
         FROM ask_questions
-        where id = #{id}
+        where id = #{id} limit 1;
     </select>
 
     <select id="getAskQuestionsById" resultType="com.adc.da.slrs.StandardQA.entity.Reply">