Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master

2 years ago · 802c9e89a4
1 changed files with 1 additions and 0 deletions
--- 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
@ -665,6 +665,7 @@
        FROM ic_event e
        LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID
        LEFT JOIN ic_event_category c ON c.IC_EVENT_ID = e.ID
        LEFT JOIN ic_event_attachment rea ON rea.ic_event_id = e.ID AND rea.del_flag = '0'
        <where>
            e.DEL_FLAG = 0
            <if test="null != orgIdPath and orgIdPath != ''">