diff --git a/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
index ef01c948..7ec95e23 100644
--- a/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
+++ b/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
@@ -145,7 +145,7 @@
         d.`NAME` AS DEPARTMENT_NAME,
         u.`NAME` AS USERNAME,
         r.FIRE_REGION_NAME,
-        if(p.LATITUDE is null or p.LONGITUDE is null, '1', '0') AS ISPUNCTUATION
+        if(p.LATITUDE is null or p.LONGITUDE is null or p.LATITUDE = '' or p.LONGITUDE = '', '1', '0') AS ISPUNCTUATION
         FROM
         bus_fire_point AS p
         LEFT JOIN bus_fire_qualified_photos fqp ON p.QUALIFIED_PHOTOS_ID = fqp.QUALIFIED_PHOTOS_ID
@@ -170,7 +170,7 @@
             AND p.FIRE_REGION_ID = #{pd.FIRE_REGION_ID}
         </if>
         <if test="pd.IS_PUNCTUATION != null and pd.IS_PUNCTUATION != ''">
-            AND if(p.LATITUDE is null or p.LONGITUDE is null, '1', '0') = #{pd.IS_PUNCTUATION}
+            AND if(p.LATITUDE is null or p.LONGITUDE is null or p.LATITUDE = '' or p.LONGITUDE = '', '1', '0') = #{pd.IS_PUNCTUATION}
         </if>
         group by p.FIRE_POINT_ID
         ORDER BY
diff --git a/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml
index de8b0c81..b92b0544 100644
--- a/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml
+++ b/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml
@@ -132,6 +132,7 @@
 
 	<select id="listAll" parameterType="pd" resultType="pd">
 		select * from bus_hotwork_cfd_examine f
+		where f.IS_DELETE = '0' and f.HOTWORK_ID = #{HOTWORK_ID}
 	</select>
 	<select id="findByCondition" resultType="com.zcloud.entity.PageData">
 		select * from bus_hotwork_cfd_examine f where f.IS_DELETE = '0'