From fbc8bbd2be5e96694100729d02ec8125b233a43e Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Fri, 6 Sep 2019 20:13:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E8=AE=AE?=
 =?UTF-8?q?=E9=A2=98=E5=86=85=E5=AE=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/modules/issue/service/impl/IssueServiceImpl.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
index 88c8bc059..89699f17f 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
@@ -164,10 +164,14 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     public IssueContentDetailDTO getIssueContentDetail(String issueId) {
         // 项目信息
         ItemEntity itemEntity = itemService.getItemByIssueId(issueId);
+        String itemId = "";
+        if (null != itemEntity) {
+            itemId = itemEntity.getId();
+        }
         // 议题详情
         IssueContentDetailDTO data = baseDao.selectOneIssueContentDetail(issueId);
         // 反馈和处理进度
-        List<IssueJobFeedbackDTO> feedbackDTOList = baseDao.selectListOfJobFeedBack(issueId, itemEntity.getId());
+        List<IssueJobFeedbackDTO> feedbackDTOList = baseDao.selectListOfJobFeedBack(issueId, itemId);
 
         data.setFeedbackDTOList(feedbackDTOList);
         return data;