From ca4efb1610647d3ac678194f39e220ffcea1a05d Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 17 Sep 2021 17:39:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=8F=AF=E4=BB=A5=E5=8F=AA?=
 =?UTF-8?q?=E4=BC=A0=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/resi/group/dto/act/form/CommentFormDTO.java     | 4 ++--
 .../resi/group/dto/notice/form/NoticeCommentFormDTO.java      | 4 ++--
 .../resi/group/dto/topic/form/ResiPublishCommentFormDTO.java  | 2 +-
 .../epmet/modules/act/service/impl/ActCommentServiceImpl.java | 4 ++++
 .../modules/notice/service/impl/NoticeCommentServiceImpl.java | 3 +++
 .../topic/service/impl/ResiTopicCommentServiceImpl.java       | 3 +++
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CommentFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CommentFormDTO.java
index 8d3cbbcbe1..6645dce753 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CommentFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CommentFormDTO.java
@@ -26,8 +26,8 @@ public class CommentFormDTO implements Serializable {
     @NotBlank(message = "groupActId不能为空", groups = AddUserInternalGroup.class)
     private String groupActId;
 
-    @NotBlank(message = "评论内容不能为空", groups = AddUserShowGroup.class)
-    @Length(max = 500, message = "评论内容最多输入500字", groups = AddUserShowGroup.class)
+    //@NotBlank(message = "评论内容不能为空", groups = AddUserShowGroup.class)
+    @Length(max = 500, message = "评论内容最多输入500字")
     private String commentContent;
     /**
      * 图片附件集合
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java
index f6d7488bb4..4269e86262 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java
@@ -22,8 +22,8 @@ public class NoticeCommentFormDTO {
     /**
      * 评论内容300
      */
-    @NotBlank(message = "评论内容不能为空",groups = {NoticeCommentFormDTO.UserShow.class})
-    @Length(max = 300, message = "评论内容不能超过300个字符",groups = {NoticeCommentFormDTO.UserShow.class})
+    //@NotBlank(message = "评论内容不能为空",groups = {NoticeCommentFormDTO.UserShow.class})
+    @Length(max = 300, message = "评论内容不能超过300个字符")
     private String commentContent;
 
     /**
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java
index 9e8b7338cd..179c53c500 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java
@@ -21,7 +21,7 @@ public class ResiPublishCommentFormDTO implements Serializable {
    @NotBlank(message = "话题Id不能为空")
    private String topicId;
 
-   @NotBlank(message = "评论内容不能为空")
+   //@NotBlank(message = "评论内容不能为空")
    private String commentContent;
 
    /**
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
index a902a78dc6..422f86d34b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
@@ -43,6 +43,7 @@ import com.epmet.resi.group.dto.act.result.CommentResultDTO;
 import com.epmet.resi.group.dto.group.result.CommentFileDTO;
 import com.epmet.resi.group.dto.notice.form.NoticeFileDTO;
 import com.github.pagehelper.PageHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -89,6 +90,9 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void submitComment(CommentFormDTO formDTO) {
+        if(StringUtils.isBlank(formDTO.getCommentContent())&& org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getImageList())){
+            throw new RenException("请至少填写评论内容或上传评论图片！");
+        }
         //1、关闭和已取消不能评论
         GroupActInfoDTO groupActInfoDTO = groupActInfoService.getGroupActInfoDTO(formDTO.getGroupActId());
         if (GroupActConstant.CLOSED.equals(groupActInfoDTO.getStatus())) {
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
index 7556f18444..cc56eb670d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
@@ -100,6 +100,9 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void noticeComment(NoticeCommentFormDTO formDTO) {
+        if(StringUtils.isBlank(formDTO.getCommentContent())&&CollectionUtils.isEmpty(formDTO.getImageList())){
+            throw new RenException("请至少填写评论内容或上传评论图片！");
+        }
         //1.内容安全校验
         String commentContent = formDTO.getCommentContent();
         if (StringUtils.isNotBlank(commentContent)) {
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
index d392e1f3e5..523f81dc49 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
@@ -198,6 +198,9 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result commentTopic(TokenDto tokenDto, ResiPublishCommentFormDTO resiCommentFormDTO) {
+        if(StringUtils.isBlank(resiCommentFormDTO.getCommentContent())&&CollectionUtils.isEmpty(resiCommentFormDTO.getImageList())){
+            throw new RenException("请至少填写评论内容或上传评论图片！");
+        }
         String commentContent = resiCommentFormDTO.getCommentContent();
         if (StringUtils.isNotBlank(commentContent)) {
             //评论话题内容审核