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 0b5e2100..c559a1e0 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 @@ -84,6 +84,7 @@ public class ReplyController extends BaseController { return Result.error("-1","编辑失败",null); } for(Reply reply: replyList){ + reply.setAnswerer(reply.getAnswererId()); reply.setState("yes"); } replyService.updateBatchById(replyList); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/Reply.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/Reply.java index d89d86f0..14093faa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/Reply.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/Reply.java @@ -71,4 +71,6 @@ public class Reply extends BaseEntity { @TableField(exist = false) private String taskId; + @TableField(exist = false) + private String answererId; } 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 3960bf9e..3318b90e 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 @@ -8,6 +8,8 @@ import com.adc.da.slrs.StandardQA.entity.AskQuestionsPage; import com.adc.da.slrs.StandardQA.entity.AskQuestionsReplyVO; import com.adc.da.slrs.StandardQA.entity.Reply; import com.adc.da.slrs.StandardQA.service.AskQuestionsService; +import com.adc.da.slrs.sarUser.entity.UpDTO; +import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -39,6 +41,9 @@ public class AskQuestionsServiceImpl extends ServiceImpl getAskQuestions(AskQuestions askQuestions) { return askQuestionsDao.getAskQuestions(askQuestions); @@ -113,8 +118,13 @@ public class AskQuestionsServiceImpl extends ServiceImpl getAskQuestionsByakId(String id,String state) { - return askQuestionsDao.getAskQuestionsByakId(id,state); + public List getAskQuestionsByakId(String id,String state,String userId) { + String questioner = askQuestionsDao.selectBYAQId(id); + String answerer = askQuestionsDao.selectByRId(id); + if (userId.equals(questioner)||userId.equals(answerer)){ + return askQuestionsDao.getAskQuestionsByakId(id,state); + } + return askQuestionsDao.getAskQuestionsById(id); } 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 291e2576..e22df6f4 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 @@ -74,7 +74,7 @@ @@ -286,6 +287,7 @@ AND reply.ASK_ID = #{id} + limit 1 @@ -297,7 +299,7 @@ AND reply.ASK_ID = #{id} - AND reply.state = '1' + AND reply.state = 'yes' order by reply.REPLY_TIME