From 803afe68037faac34b7b120505ffeed434580318 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 14 七月 2023 14:06:40 +0800
Subject: [PATCH] 优化代码

---
 service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java |   24 +++++++-----------------
 1 files changed, 7 insertions(+), 17 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 ca35d93..aa623ba 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
@@ -3,11 +3,11 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.questionAnswer.QuestionAnswerDto;
-import com.java110.dto.questionAnswerTitle.QuestionAnswerTitleDto;
-import com.java110.dto.questionAnswerTitleValue.QuestionAnswerTitleValueDto;
+import com.java110.dto.questionAnswer.QuestionAnswerTitleDto;
+import com.java110.dto.questionAnswer.QuestionAnswerTitleValueDto;
 import com.java110.po.questionAnswer.QuestionAnswerPo;
-import com.java110.po.questionAnswerTitle.QuestionAnswerTitlePo;
-import com.java110.po.questionAnswerTitleValue.QuestionAnswerTitleValuePo;
+import com.java110.po.questionAnswer.QuestionAnswerTitlePo;
+import com.java110.po.questionAnswer.QuestionAnswerTitleValuePo;
 import com.java110.user.bmo.questionAnswer.IDeleteQuestionAnswerBMO;
 import com.java110.user.bmo.questionAnswer.IGetQuestionAnswerBMO;
 import com.java110.user.bmo.questionAnswer.ISaveQuestionAnswerBMO;
@@ -89,9 +89,6 @@
         Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈endTime");
         Assert.hasKeyAndValue(reqJson, "objType", "璇锋眰鎶ユ枃涓湭鍖呭惈objType");
 
-        if (QuestionAnswerDto.QA_TYPE_STORE.equals(reqJson.getString("objType"))) {
-            reqJson.put("objId", storeId);
-        }
         Assert.hasKeyAndValue(reqJson, "objId", "璇锋眰鎶ユ枃涓湭鍖呭惈objId");
 
         QuestionAnswerPo questionAnswerPo = BeanConvertUtil.covertBean(reqJson, QuestionAnswerPo.class);
@@ -156,16 +153,9 @@
         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);
-        } else {
-            questionAnswerDto.setObjIds(new String[]{storeId, communityId});
-        }
         return getQuestionAnswerBMOImpl.get(questionAnswerDto);
     }
 
@@ -276,7 +266,7 @@
         //questionAnswerTitleDto.setUserId(userId);
         if (!StringUtil.isEmpty(objType)) {
             questionAnswerTitleDto.setObjType(objType);
-            questionAnswerTitleDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
+            questionAnswerTitleDto.setObjId(communityId);
         } else {
             questionAnswerTitleDto.setObjIds(new String[]{storeId, communityId});
         }
@@ -356,7 +346,7 @@
         questionAnswerTitleValueDto.setPage(page);
         questionAnswerTitleValueDto.setRow(row);
         questionAnswerTitleValueDto.setObjType(objType);
-        questionAnswerTitleValueDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
+        questionAnswerTitleValueDto.setObjId(communityId);
         return getQuestionAnswerTitleValueBMOImpl.get(questionAnswerTitleValueDto);
     }
 
@@ -381,7 +371,7 @@
         questionAnswerTitleValueDto.setRow(row);
         questionAnswerTitleValueDto.setObjType(objType);
         questionAnswerTitleValueDto.setTitleId(titleId);
-        questionAnswerTitleValueDto.setObjId(QuestionAnswerDto.QA_TYPE_COMMUNITY.equals(objType) ? communityId : storeId);
+        questionAnswerTitleValueDto.setObjId(communityId);
         return getQuestionAnswerTitleValueBMOImpl.queryQuestionAnswerTitleValueResult(questionAnswerTitleValueDto);
     }
 }

--
Gitblit v1.8.0