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 85113ec1a4..8a93f11709 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 @@ -546,9 +546,12 @@ FROM ic_event_reply r - r.DEL_FLAG = 0 AND r.MANAGE_STATUS = #{manageType} - - OR r.MANAGE_STATUS = 3 OR r.MANAGE_STATUS = 4 + r.DEL_FLAG = 0 + + AND r.MANAGE_STATUS = #{manageType} + + + AND (r.MANAGE_STATUS = #{manageType} OR r.MANAGE_STATUS = 3 OR r.MANAGE_STATUS = 4) AND r.IC_EVENT_ID IN ( SELECT e.id from ic_event e @@ -561,6 +564,7 @@ AND e.GRID_PIDS LIKE concat(#{orgIdPath},'%') + group by e.id ) @@ -679,7 +683,7 @@ SELECT count( r.id ) AS total FROM ic_event_reply r r.DEL_FLAG = 0 - AND r.MANAGE_STATUS = 2 OR r.MANAGE_STATUS = 3 OR r.MANAGE_STATUS = 4 OR r.MANAGE_STATUS = 5 + AND r.MANAGE_STATUS = 2 OR r.MANAGE_STATUS = 3 OR r.MANAGE_STATUS = 4 AND r.IC_EVENT_ID IN ( SELECT e.id AS id FROM ic_event e