From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java b/service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java
index 90d2349..3a05e1f 100755
--- a/service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java
+++ b/service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java
@@ -150,12 +150,18 @@
@RequestHeader(value = "user-id", required = false) String userId,
@RequestParam(value = "communityId", required = false) String communityId,
@RequestParam(value = "objType", required = false) String objType,
+ @RequestParam(value = "qaType", required = false) String qaType,
+ @RequestParam(value = "qaName", required = false) String qaName,
+ @RequestParam(value = "qaId", required = false) String qaId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
QuestionAnswerDto questionAnswerDto = new QuestionAnswerDto();
questionAnswerDto.setPage(page);
questionAnswerDto.setRow(row);
questionAnswerDto.setUserId(userId);
+ questionAnswerDto.setQaType(qaType);
+ questionAnswerDto.setQaName(qaName);
+ questionAnswerDto.setQaId(qaId);
if (!StringUtil.isEmpty(objType)) {
questionAnswerDto.setObjType(objType);
questionAnswerDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
@@ -374,12 +380,14 @@
public ResponseEntity<String> queryTitleValueResult(@RequestHeader(value = "store-id") String storeId,
@RequestParam(value = "communityId", required = false) String communityId,
@RequestParam(value = "objType") String objType,
+ @RequestParam(value = "titleId",required = false) String titleId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
QuestionAnswerTitleValueDto questionAnswerTitleValueDto = new QuestionAnswerTitleValueDto();
questionAnswerTitleValueDto.setPage(page);
questionAnswerTitleValueDto.setRow(row);
questionAnswerTitleValueDto.setObjType(objType);
+ questionAnswerTitleValueDto.setTitleId(titleId);
questionAnswerTitleValueDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
return getQuestionAnswerTitleValueBMOImpl.queryQuestionAnswerTitleValueResult(questionAnswerTitleValueDto);
}
--
Gitblit v1.8.0