diff --git a/city-sjdz-services-biz/city-sjdz-base/city-sjdz-base-biz/src/main/resources/mapper/SafetyRiskEventInfoMapper.xml b/city-sjdz-services-biz/city-sjdz-base/city-sjdz-base-biz/src/main/resources/mapper/SafetyRiskEventInfoMapper.xml
index b6142b1d86d9a0e44746c913d718d84d01f8a601..1edc739159fa7b6d22061e24a1c9456dd2b5616c 100644
--- a/city-sjdz-services-biz/city-sjdz-base/city-sjdz-base-biz/src/main/resources/mapper/SafetyRiskEventInfoMapper.xml
+++ b/city-sjdz-services-biz/city-sjdz-base/city-sjdz-base-biz/src/main/resources/mapper/SafetyRiskEventInfoMapper.xml
@@ -124,6 +124,8 @@
 				and	 eve.area_code = #{areaCode}
 			</if>
 		and	TRUNC(warning_time) >= TRUNC(SYSDATE - INTERVAL '30' DAY)
+			AND  risklevel is NOT NULL   AND  report_object IS NOT NULL
+			and	 current_status != '作废'
 			AND risklevel = #{levelName}
 		</where>
 		GROUP BY
@@ -140,6 +142,8 @@
 		FROM
 			safety_risk_event_info
 		where area_name IS NOT NULL      and	TRUNC(warning_time) >= TRUNC(SYSDATE - INTERVAL '30' DAY)
+		  AND  risklevel is NOT NULL   AND  report_object IS NOT NULL
+		  and	 current_status != '作废'
 		GROUP BY
 			area_name
 	</select>
@@ -151,6 +155,8 @@
 		FROM
 			safety_risk_event_info
 		where event_type IS NOT NULL  and	TRUNC(warning_time) >= TRUNC(SYSDATE - INTERVAL '30' DAY)
+		  AND  risklevel is NOT NULL   AND  report_object IS NOT NULL
+		  and	 current_status != '作废'
 		GROUP BY
 			event_type
 		ORDER BY  total     desc