From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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
index e306813..3111455 100755
--- a/service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java
+++ b/service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java
@@ -3,10 +3,10 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.questionAnswer.QuestionAnswerDto;
-import com.java110.dto.userQuestionAnswer.UserQuestionAnswerDto;
-import com.java110.dto.userQuestionAnswerValue.UserQuestionAnswerValueDto;
-import com.java110.po.userQuestionAnswer.UserQuestionAnswerPo;
-import com.java110.po.userQuestionAnswerValue.UserQuestionAnswerValuePo;
+import com.java110.dto.user.UserQuestionAnswerDto;
+import com.java110.dto.user.UserQuestionAnswerValueDto;
+import com.java110.po.user.UserQuestionAnswerPo;
+import com.java110.po.user.UserQuestionAnswerValuePo;
import com.java110.user.bmo.userQuestionAnswer.IDeleteUserQuestionAnswerBMO;
import com.java110.user.bmo.userQuestionAnswer.IGetUserQuestionAnswerBMO;
import com.java110.user.bmo.userQuestionAnswer.ISaveUserQuestionAnswerBMO;
@@ -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,8 +114,8 @@
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 = "state") String state,
+ @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();
@@ -163,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