From 45d02d8aff5c186159f99f25b2fcd3c5b3aef6b0 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Fri, 20 Sep 2019 19:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/events/result/EventAppDetailResultDTO.java   | 12 ++++++++++++
 .../modules/item/service/impl/ItemServiceImpl.java   |  3 ++-
 .../main/resources/mapper/events/EpdcEventsDao.xml   |  6 ++++++
 .../src/main/resources/mapper/item/ItemDao.xml       |  6 +++---
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/EventAppDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/EventAppDetailResultDTO.java
index 0c349cbec..821393af2 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/EventAppDetailResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/EventAppDetailResultDTO.java
@@ -21,6 +21,18 @@ public class EventAppDetailResultDTO implements Serializable {
      * 事件内容
      */
     private String content;
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+    /**
+     * 头像地址
+     */
+    private String avatar;
+    /**
+     * 是否党员 0否；1是
+     */
+    private String partyFlag;
     /**
      * 发布时间
      */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index 0c5d60e54..fefc4f6bf 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -320,6 +320,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         itemHandleResultDTO.setProcessResult(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue());
         itemHandleResultDTO.setProcessName(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getName());
         itemHandleResultDTO.setSelect(false);
+        itemHandleResultDTOS.add(itemHandleResultDTO);
         resultDTO.setHandleResultDTOS(itemHandleResultDTOS);
 
         return resultDTO;
@@ -461,7 +462,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         String typeKey = "";
         for (ItemCirculationDeptResultDTO circulationDeptResultDTO:
                 dto.getDeptResultDTOS()) {
-            if (!typeKey.equals(circulationDeptResultDTO.getTypeKey())) {
+            if (!"".equals(typeKey) && !typeKey.equals(circulationDeptResultDTO.getTypeKey())) {
                 return new Result().error("不可跨部门流转协助，请重新选择流转协助部门");
             }
             typeKey = circulationDeptResultDTO.getTypeKey();
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
index ac484eab0..733313b1f 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
@@ -204,6 +204,9 @@
         <result property="distributeTime" column="CREATED_TIME"/>
         <result property="address" column="ISSUE_ADDRESS"/>
         <result property="advice" column="ADVICE"/>
+        <result property="nickname" column="NICK_NAME"/>
+        <result property="avatar" column="USER_FACE"/>
+        <result property="partyFlag" column="IS_PARTY_MEMBER"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -215,6 +218,9 @@
             eve.CREATED_TIME,
             eve.ISSUE_ADDRESS,
             eve.ADVICE,
+            eve.NICK_NAME,
+            eve.USER_FACE,
+            eve.IS_PARTY_MEMBER,
             img.IMG_URL
         FROM
             epdc_events eve
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 ba1b5292d..f3ac06a1c 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
@@ -49,11 +49,11 @@
         CASE
         item.ITEM_STATE
         WHEN 0 THEN
-        '【处理中】'
+        '处理中'
         WHEN 5 THEN
-        '【已关闭】'
+        '已关闭'
         WHEN 10 THEN
-        '【已结案】' ELSE ''
+        '已结案' ELSE ''
         END AS stateName
         FROM
         epdc_item item