From ef0b698b688c751b5a8f7e40c0be742225f01a8f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 05 二月 2021 18:04:47 +0800
Subject: [PATCH] 优化objId 抒写错误问题
---
service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 a11aa62..d1ac53b 100644
--- a/service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java
+++ b/service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java
@@ -21,6 +21,7 @@
import com.java110.user.bmo.questionAnswerTitleValue.IUpdateQuestionAnswerTitleValueBMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -140,7 +141,7 @@
*/
@RequestMapping(value = "/queryQuestionAnswer", method = RequestMethod.GET)
public ResponseEntity<String> queryQuestionAnswer(
- @RequestHeader(value = "store-id") String storeId,
+ @RequestHeader(value = "store-id",required = false) String storeId,
@RequestParam(value = "communityId", required = false) String communityId,
@RequestParam(value = "objType", required = false) String objType,
@RequestParam(value = "page") int page,
@@ -148,8 +149,12 @@
QuestionAnswerDto questionAnswerDto = new QuestionAnswerDto();
questionAnswerDto.setPage(page);
questionAnswerDto.setRow(row);
- questionAnswerDto.setObjType(objType);
- questionAnswerDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.endsWith(objType) ? communityId : storeId);
+ if (!StringUtil.isEmpty(objType)) {
+ questionAnswerDto.setObjType(objType);
+ questionAnswerDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
+ } else {
+ questionAnswerDto.setObjIds(new String[]{storeId, communityId});
+ }
return getQuestionAnswerBMOImpl.get(questionAnswerDto);
}
@@ -235,7 +240,7 @@
questionAnswerTitleDto.setPage(page);
questionAnswerTitleDto.setRow(row);
questionAnswerTitleDto.setObjType(objType);
- questionAnswerTitleDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.endsWith(objType) ? communityId : storeId);
+ questionAnswerTitleDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
return getQuestionAnswerTitleBMOImpl.get(questionAnswerTitleDto);
}
@@ -319,7 +324,7 @@
questionAnswerTitleValueDto.setPage(page);
questionAnswerTitleValueDto.setRow(row);
questionAnswerTitleValueDto.setObjType(objType);
- questionAnswerTitleValueDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.endsWith(objType) ? communityId : storeId);
+ questionAnswerTitleValueDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
return getQuestionAnswerTitleValueBMOImpl.get(questionAnswerTitleValueDto);
}
}
--
Gitblit v1.8.0