Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp

epmet-gateway/src/main/resources/bootstrap.yml

@@ -484,6 +484,8 @@ epmet:
     - /message/template/**
     - /data/aggregator/project/projectdistribution
     - /data/aggregator/epmetuser/open-staffdetail
+    - /pub/**
+    - /screen/agency/getStaffAgencyTree
     #stats external包下 公共的类只外部暴露方法 纯外部使用的 暴漏整个
     - /data/stats/statsuser/gm-uploadevent
     - /data/stats/statsuser/gm-uploaddata

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -187,7 +187,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         }
         userResult.getData().forEach(u -> {
             if (u.getUserId().equals(dto.getEventUserId())){
-                dto.setEventPeopleName(u.getShowName());
+                dto.setEventPeopleName(u.getUserShowName());
             }
         });
         // 查询所属网格

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml

@@ -15,7 +15,7 @@
         </collection>
     </resultMap>
     <select id="eventUnDisposedList" resultMap="eventUnDisposedListMap">
-        SELECT IFNULL(rea.ATTACHMENT_URL,'') AS img,t.* FROM
+        SELECT rea.ATTACHMENT_URL AS img,t.* FROM
         (SELECT
         re.EVENT_CONTENT AS eventContent,
         <if test='eventType == "undisposed" '>
@@ -49,7 +49,7 @@
             ORDER BY re.CLOSE_CASE_TIME DESC
         </if>
         )t
-        inner JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 0 OR rea.SORT = 1 OR rea.SORT = 2))
+        LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 0 OR rea.SORT = 1 OR rea.SORT = 2))
     </select>