From a2c1ee33a41a1728c7da60eb23934715dc8be546 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Tue, 24 Sep 2019 15:56:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=AF=84=E8=AE=BA=E6=88=96?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/dto/comment/form/CommentFormDTO.java    | 4 +++-
 .../comment/controller/AppEventCommentController.java       | 3 ++-
 .../epdc/modules/comment/service/EventCommentService.java   | 2 +-
 .../comment/service/impl/EventCommentServiceImpl.java       | 6 ++++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/CommentFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/CommentFormDTO.java
index 7269c46a3..e846e9c26 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/CommentFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/CommentFormDTO.java
@@ -11,6 +11,7 @@ package com.elink.esua.epdc.dto.comment.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 
 /**
  * 评论议题、提交评论
@@ -28,12 +29,13 @@ public class CommentFormDTO {
     //父评论（被评论）ID
     private String faCommentId;
 
-    @NotBlank(message = "评论内容不能为空")
+    @Size(min = 1, max = 500, message = "评论内容不能超过500字")
     private String content;
 
     /**
      * 评论人ID
      */
+    @NotBlank(message = "评论人ID不能为空")
     private String userId;
 
     /**
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java
index 2d11550d4..d960b1330 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java
@@ -42,11 +42,12 @@ public class AppEventCommentController {
 
     /**
      * 提交评论或回复接口
-     * @param dto
+     * @param commentFormDTO
      * @return
      */
     @PostMapping("submit")
     public Result submit(@RequestBody CommentFormDTO commentFormDTO){
+        ValidatorUtils.validateEntity(commentFormDTO);
         return eventCommentService.submit(commentFormDTO);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java
index 92a86c50b..7cc635474 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java
@@ -100,7 +100,7 @@ public interface EventCommentService extends BaseService<EventCommentEntity> {
 
     /**
      * 提交评论或回复接口
-     * @param dto
+     * @param commentFormDTO
      */
     Result submit(CommentFormDTO commentFormDTO);
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
index 171252fd9..272425aa0 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
@@ -145,10 +145,16 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
         // 判断评论或回复的是议题还是项目
         if (StringUtils.isNotEmpty(commentFormDTO.getIssueId())) {
             issueEntity = issueService.selectById(commentFormDTO.getIssueId());
+            if (null == issueEntity || StringUtils.isEmpty(issueEntity.getEventId())) {
+                return new Result().error("获取事件信息失败");
+            }
             commentEntity.setEventId(issueEntity.getEventId());
         } else {
             isIssue = false;
             itemEntity = itemService.selectById(commentFormDTO.getItemId());
+            if (null == itemEntity || StringUtils.isEmpty(itemEntity.getEventId())) {
+                return new Result().error("获取事件信息失败");
+            }
             commentEntity.setEventId(itemEntity.getEventId());
         }