Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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

@@ -551,8 +551,11 @@
         <if test="null != manageType and manageType != '' and manageType == 0">
             AND (e.REPLY_STATUS = #{manageType} or e.REPLY_STATUS is null)
         </if>
-        <if test="null != manageType and manageType != '' and manageType == 1 and manageType == 5">
-            AND e.REPLY_STATUS = #{manageType}
+        <if test="null != manageType and manageType != '' and manageType == 1">
+            AND e.REPLY_STATUS = 1
+        </if>
+        <if test="null != manageType and manageType != '' and manageType == 5">
+            AND e.REPLY_STATUS = 5
         </if>
         <if test="null != manageType and manageType != '' and manageType == 2">
             AND (e.REPLY_STATUS = #{manageType} or e.REPLY_STATUS = 3 or e.REPLY_STATUS = 4)