From a18b9675a03473c55ad67af32d598a6ce112cf8d Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Thu, 31 Oct 2019 13:23:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/modules/events/service/impl/EpdcEventsServiceImpl.java | 2 +-
 .../src/main/resources/mapper/issue/IssueDao.xml                | 2 ++
 .../src/main/resources/mapper/item/ItemDao.xml                  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
index 506cbb1a1..30f7cda56 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
@@ -247,7 +247,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         Long userId = SecurityUser.getUserId();
         // 获取部门信息
         Result<SysDeptDTO> dtoResult = adminFeignClient.getSysDeptInfo(deptId);
-        if (dtoResult.success()) {
+        if (dtoResult.success() && null != dtoResult.getData()) {
             // 网格用户
             if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(dtoResult.getData().getTypeKey())) {
                 // 议题-待回应
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
index ca6d2fa46..efa7ece37 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
@@ -147,6 +147,7 @@
         SELECT
             CREATED_TIME AS createdTime,
             advice,
+            HANDLER_DEPT AS handlerDept,
             ( CASE STATE WHEN 0 THEN '【审核通过】' WHEN 1 THEN '【反馈】' WHEN 2 THEN '【已关闭】' ELSE '' END ) AS stateName
         FROM
             epdc_issue_handle
@@ -156,6 +157,7 @@
         SELECT
             CREATED_TIME AS createdTime,
             HANDLE_ADVICE AS advice,
+            HANDLER_DEPT AS handlerDept,
             (
             CASE
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index b44920af3..656630725 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -318,7 +318,7 @@
     <resultMap id="itemHandleMap" type="com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO">
         <result property="createdTime" column="createdTime"/>
         <result property="advice" column="advice"/>
-        <result property="handlerDept" column="HANDLER_DEPT"/>
+        <result property="handlerDept" column="handlerDept"/>
         <result property="progressName" column="progressName"/>
         <collection property="itemDeptDTOS" ofType="com.elink.esua.epdc.dto.item.ItemDeptDTO">
             <result property="deptName" column="DEPT_NAME"/>