From 0ed29a9b6e7cdeeea5f736d5cbe196849b4f22f7 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 19 七月 2023 09:40:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xinghong-dev
---
service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 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 e306813..c300399
--- a/service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java
+++ b/service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java
@@ -2,11 +2,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 +16,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 +113,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();
@@ -122,15 +122,10 @@
userQuestionAnswerDto.setRow(row);
userQuestionAnswerDto.setState(state);
if ("owner".equals(roleCd)) {
- userQuestionAnswerDto.setObjType(QuestionAnswerDto.QA_TYPE_COMMUNITY);
- userQuestionAnswerDto.setObjId(communityId);
- userQuestionAnswerDto.setPersonId(userId);
- userQuestionAnswerDto.setQaTypes(new String[]{"1001", "3003"});
+ userQuestionAnswerDto.setCommunityId(communityId);
+
} else {
- userQuestionAnswerDto.setObjType(QuestionAnswerDto.QA_TYPE_STORE);
- userQuestionAnswerDto.setObjId(storeId);
- userQuestionAnswerDto.setPersonId(userId);
- userQuestionAnswerDto.setQaTypes(new String[]{"2002", "4004"});
+
}
return getUserQuestionAnswerBMOImpl.get(userQuestionAnswerDto);
}
@@ -163,12 +158,15 @@
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);
- userQuestionAnswerValuePo.setPersonId(userId);
return saveUserQuestionAnswerValueBMOImpl.save(userQuestionAnswerValuePo, questionAnswerTitles);
@@ -227,7 +225,7 @@
UserQuestionAnswerValueDto userQuestionAnswerValueDto = new UserQuestionAnswerValueDto();
userQuestionAnswerValueDto.setPage(page);
userQuestionAnswerValueDto.setRow(row);
- userQuestionAnswerValueDto.setObjId(communityId);
+ userQuestionAnswerValueDto.setCommunityId(communityId);
return getUserQuestionAnswerValueBMOImpl.get(userQuestionAnswerValueDto);
}
}
--
Gitblit v1.8.0