From 0508232730819989e644873ee3b217dc622ada76 Mon Sep 17 00:00:00 2001
From: qk <1005180704@qq。com>
Date: Thu, 9 Jun 2022 14:03:21 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E9=97=AE=E7=AD=94bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ReplyController.java           | 17 +++++++++++++----
 .../askQuestions/AskQuestionsMapper.xml       | 19 +++++++++++--------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java
index 890b2373..cb0f083f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java
@@ -10,6 +10,7 @@ import com.adc.da.util.http.Result;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,18 +38,26 @@ public class ReplyController extends BaseController<Reply> {
 
     @PostMapping("/insertReply")
     public ResponseMessage insertReply(@RequestBody Reply reply){
-        reply.setAppendixId(reply.getFileList().get(0).getAttId());
-        reply.setAppendixName(reply.getFileList().get(0).getName());
+        if(StringUtils.isEmpty(reply.getReply())){
+            return Result.error("-1","请输入回答内容");
+        }
+        if(reply.getFileList().size() >0) {
+            reply.setAppendixId(reply.getFileList().get(0).getAttId());
+            reply.setAppendixName(reply.getFileList().get(0).getName());
+        }
         reply.setReplyTime(new Date());
         reply.setId(UUIDUtils.randomUUID20());
         if(replyService.save(reply)){
-            return Result.success("200","添加成功");
+            return Result.success("200","提交成功");
         }else {
-            return Result.error("200","添加失败");
+            return Result.error("-1","添加失败");
         }
     }
     @PostMapping("/updateReply")
     public ResponseMessage updateReply(String id){
+        if(StringUtils.isEmpty(id)){
+            return Result.error("-1","请选择要归档的回答");
+        }
         List<String> list = Arrays.asList(id.split(","));
         for (String s: list) {
             UpdateWrapper updateWrapper = new UpdateWrapper();
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 de6fc060..b3165110 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
@@ -68,17 +68,20 @@
             SELECT reply.ID, reply.REPLY,reply.REPLY_TIME,t2.UNAME ANSWERER,reply.APPENDIX_ID,APPENDIX_NAME
             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>
-        </where>
+            <where>
+                <if test="id !=null and id !=''">
+                    AND reply.ASK_ID = #{id}
+                </if>
+            </where>
+            order by reply.REPLY_TIME
+
     </select>
 
     <select id="getReplyDetails" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
-            SELECT aq.ID,aq.CLASSIFICATION,aq.PROBLEM_DESCRIPTION,t1.UNAME QUESTIONER,aq.QUESTION_TIME,aq.STANDARD_ENCDOING,
-            aq.STANDARD_NAME,aq.STANDARD_ID,reply.REPLY,reply.REPLY_TIME,t2.UNAME ANSWERER,
-            reply.APPENDIX,reply.APPENDIX_ID,reply.APPENDIX_NAME
+            SELECT
+            DISTINCT
+            aq.STANDARD_ID,aq.CLASSIFICATION,aq.STANDARD_ENCDOING,
+            aq.STANDARD_NAME
             FROM ask_questions aq
             LEFT JOIN reply ON aq.ID = reply.ASK_ID AND reply.STATE = '0'
             LEFT JOIN ts_user t1 ON t1.USID = aq.QUESTIONER