bug

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

@@ -49,7 +49,7 @@
             ORDER BY re.CLOSE_CASE_TIME DESC
         </if>
         )t
-        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))
+        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))
     </select>
 
 
@@ -132,8 +132,8 @@
             (CASE WHEN re.READ_FLAG = 1 THEN FALSE ELSE TRUE END) AS isRollback,
             (CASE WHEN re.SHIFT_PROJECT = 1 THEN TRUE ELSE FALSE END) AS isProject,
             IFNULL(re.project_id,'') AS projectId,
-            IFNULL(ea.ATTACHMENT_URL,'') AS eventImg,
+            ea.ATTACHMENT_URL AS eventImg,
-            concat('人大代表-',IFNULL(em.USER_SHOW_NAME,'')) AS person,
+            IF(ISNULL(em.USER_SHOW_NAME),NULL,concat('人大代表-',em.USER_SHOW_NAME)) AS person,
             re.GRID_ID AS gridId,
             re.CREATED_BY AS eventUserId,
             ro.ORG_ID AS orgId
@@ -177,11 +177,11 @@
         SELECT
         IFNULL(re.EVENT_CONTENT,'') AS eventContent,
         DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i') AS eventTime,
-        IFNULL(ea.ATTACHMENT_URL,'') AS img,
+        ea.ATTACHMENT_URL AS img,
         re.id as eventId
         FROM resi_event_report_org ro
         LEFT JOIN resi_event re ON (re.ID = ro.RESI_EVENT_ID AND re.DEL_FLAG = '0')
-        inner JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND
+        LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND
         ea.ATTACHMENT_TYPE = 'image' AND ea.SORT IN (0,1,2))
         WHERE ro.DEL_FLAG = '0'
         AND ro.ORG_READ = 'un_read'