From bcdec8bd0a4ec5fd8a0160754b5242bc710b9cc4 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Mon, 23 Sep 2019 14:59:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6ID=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EventCommentServiceImpl.java        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 86dd7fd40..171252fd9 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
@@ -43,6 +43,8 @@ import com.elink.esua.epdc.modules.issue.service.IssueService;
 import com.elink.esua.epdc.modules.item.entity.ItemEntity;
 import com.elink.esua.epdc.modules.item.service.ItemService;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -60,6 +62,8 @@ import java.util.Map;
 @Service
 public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, EventCommentEntity> implements EventCommentService {
 
+    private static final Logger logger = LoggerFactory.getLogger(EventCommentServiceImpl.class);
+
     @Autowired
     private EpdcEventsService epdcEventsService;
 
@@ -229,9 +233,17 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
         // 获取议题ID
         if (StringUtils.isNotEmpty(formDTO.getIssueId())) {
             IssueEntity issueEntity = issueService.selectById(formDTO.getIssueId());
+            if (null == issueEntity) {
+                logger.info("获取评论列表失败，议题ID：{}", formDTO.getIssueId());
+                return new Result<EventCommentsResultDTO>().error("获取评论列表失败");
+            }
             formDTO.setEventId(issueEntity.getEventId());
         } else {
             ItemEntity itemEntity = itemService.selectById(formDTO.getItemId());
+            if (null == itemEntity) {
+                logger.info("获取评论列表失败，项目ID：{}", formDTO.getItemId());
+                return new Result<EventCommentsResultDTO>().error("获取评论列表失败");
+            }
             formDTO.setEventId(itemEntity.getEventId());
         }
         // 表态数