Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

business-service/src/main/resources/mapper/service/MsgWebPushMapper.xml

@@ -8,7 +8,7 @@
         join msg_alarm AS b on a.alarm_id = b.alarm_id
         join base_camera_management AS c on b.camera_code = c.camera_code
         <where>
-            status = 1
+            a.status = 1
             <if test="!dsFlay">
                 and
                 <trim prefix="(" prefixOverrides="or" suffix=")">
@@ -35,7 +35,7 @@
         join msg_alarm AS b on a.alarm_id = b.alarm_id
         join base_camera_management AS c on b.camera_code = c.camera_code
         <where>
-            status = 1
+            a.status = 1
             <if test="!dsFlay">
                 and
                 <trim prefix="(" prefixOverrides="or" suffix=")">
@@ -80,6 +80,9 @@
                     </if>
                 </trim>
             </if>
+            <if test="status != null and status != ''">
+                and a.status = #{status}
+            </if>
             <if test="alarmType != null and alarmType != ''">
                 and b.alarm_type = #{alarmType}
             </if>