diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index 2e0d084c24..a56e70d41f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -386,7 +386,7 @@ ic_event_reply rer WHERE rer.del_flag = '0' - AND rer.resi_event_id = #{icEventId} + AND rer.ic_event_id = #{icEventId} ORDER BY rer.created_time DESC @@ -396,13 +396,15 @@ re.id AS resiEventId, re.event_content AS eventContent, if(re.operation_type='1', '1', '0') AS shiftProject, - if(re.operation_type='1', re.OPERATION_ID, '') AS projectId, + if(re.operation_type='1', re.operation_id, '') AS projectId, re.created_time AS reportTime FROM ic_event re WHERE re.del_flag = '0' - AND re.report_user_id = '' + + re.report_user_id = #{epmetUserId} + ORDER BY re.created_time desc @@ -452,7 +454,7 @@ ea.ATTACHMENT_TYPE AS type, ea.duration AS duration, re.GRID_ID AS gridId, - re.CREATED_BY AS eventUserId, + re.REPORT_USER_ID AS eventUserId, re.AGENCY_ID AS orgId FROM ic_event re LEFT JOIN ic_event_attachment ea ON (ea.IC_EVENT_ID = re.ID AND ea.DEL_FLAG = '0')