From e5f5f2ac91a563dcb1e1bc6f1e005fc39e7fd6a1 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 27 Jun 2022 16:35:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93=EF=BC=9Ahttp://zentao.elinks?= =?UTF-8?q?ervice.cn/story-view-670.html=20=E4=B8=AA=E4=BA=BA=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=E4=B8=AD=E4=B8=8A=E6=8A=A5=E4=BA=8B=E4=BB=B6=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E7=94=B1=E5=8E=9F?= =?UTF-8?q?=E6=9D=A5=E7=9A=84=E6=9F=A5=E8=AF=A2resi=5Fevent=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=9F=A5=E8=AF=A2ic=5Fevent=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E5=B8=82=E5=8C=97=E5=AE=A2=E6=88=B7=E7=BB=A7=E7=BB=AD=E6=B2=BF?= =?UTF-8?q?=E7=94=A8=E4=B9=8B=E5=89=8D=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcEventDao.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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')