查询告警时，只显示1-未对应，2-对应中，去掉【自动恢复告警时保留 的】

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml

@@ -289,8 +289,8 @@
 
     <sql id="Where_In_Alarm">
         (alert_history.handle_status != 3 AND alert_history.handle_status != 4)
-        OR
+#         OR
-        (alert_history.handle_status = 4 AND alert_history.retain_alert = 1)
+#         (alert_history.handle_status = 4 AND alert_history.retain_alert = 1)
     </sql>
 
     <select id="getDevice4AlarmData" resultType="com.dongjian.dashboard.back.vo.data.DeviceAlarmData">