From 053cde14fd4fb3106a0fd0b9acd4c446e30af1af Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 12 Oct 2022 13:23:57 +0800
Subject: [PATCH] /resi/group/topic/topicattachmentlist

---
 .../epmet/modules/topic/controller/ResiTopicController.java    | 2 +-
 .../epmet/modules/topic/service/impl/ResiTopicServiceImpl.java | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
index fb2ef52238..f1b5c1d79a 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
@@ -419,7 +419,7 @@ public class ResiTopicController {
      **/
     @PostMapping(value = "topicattachmentlist")
     public Result<TopicAttachmentResultDTO> topicAttachmentList(@RequestBody TopicAttachmentFormDTO formDTO){
-        ValidatorUtils.validateEntity(formDTO, TopicAttachmentFormDTO.TopicForm.class);
+        // ValidatorUtils.validateEntity(formDTO, TopicAttachmentFormDTO.TopicForm.class);//暂时不校验了，service里判断
         return new Result<TopicAttachmentResultDTO>().ok(topicService.topicAttachmentList(formDTO));
     }
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 65d7082753..ff564c7f01 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -2439,6 +2439,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      **/
     @Override
     public TopicAttachmentResultDTO topicAttachmentList(TopicAttachmentFormDTO formDTO) {
+        if(StringUtils.isBlank(formDTO.getTopicId())){
+            return null;
+        }
         TopicAttachmentResultDTO resultDTO = new TopicAttachmentResultDTO();
         //1.根据话题id查询所有的附件数据
         List<ResiTopicAttachmentDTO> list = resiTopicAttachmentDao.selectTopicAttachmentList(formDTO.getTopicId());