From ffbd3623328201512baac3f87c7a9864c322bfec Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 02 九月 2022 11:29:49 +0800
Subject: [PATCH] 开启开发者模式
---
service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java b/service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java
old mode 100644
new mode 100755
index 5a93624..6a9fa34
--- a/service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java
+++ b/service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java
@@ -17,6 +17,7 @@
import com.java110.user.bmo.userQuestionAnswerValue.IUpdateUserQuestionAnswerValueBMO;
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.*;
@@ -113,12 +114,14 @@
public ResponseEntity<String> queryUserQuestionAnswer(@RequestHeader(value = "store-id") String storeId,
@RequestHeader(value = "user-id") String userId,
@RequestParam(value = "communityId", required = false) String communityId,
- @RequestParam(value = "roleCd") String roleCd,
+ @RequestParam(value = "roleCd", required = false) String roleCd,
+ @RequestParam(value = "state", required = false) String state,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
UserQuestionAnswerDto userQuestionAnswerDto = new UserQuestionAnswerDto();
userQuestionAnswerDto.setPage(page);
userQuestionAnswerDto.setRow(row);
+ userQuestionAnswerDto.setState(state);
if ("owner".equals(roleCd)) {
userQuestionAnswerDto.setObjType(QuestionAnswerDto.QA_TYPE_COMMUNITY);
userQuestionAnswerDto.setObjId(communityId);
@@ -161,7 +164,11 @@
JSONObject titleObj = null;
for (int questionAnswerTitleIndex = 0; questionAnswerTitleIndex < questionAnswerTitles.size(); questionAnswerTitleIndex++) {
titleObj = questionAnswerTitles.getJSONObject(questionAnswerTitleIndex);
- Assert.hasKeyAndValue(titleObj, "valueContent", titleObj.getString("qaTitle") + ",鏈～鍐欑瓟妗�");
+ if (titleObj.containsKey("qaTitle") && !StringUtil.isEmpty(titleObj.getString("qaTitle"))) {
+ Assert.hasKeyAndValue(titleObj, "valueContent", titleObj.getString("qaTitle") + ",鏈～鍐欑瓟妗�");
+ } else {
+ Assert.hasKeyAndValue(titleObj, "valueContent", "鏈～鍐欑瓟妗�");
+ }
}
UserQuestionAnswerValuePo userQuestionAnswerValuePo = BeanConvertUtil.covertBean(reqJson, UserQuestionAnswerValuePo.class);
--
Gitblit v1.8.0