From 29f4e7df5e2efc0524aa3657a9a633a68a87d259 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Thu, 9 May 2024 14:44:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=8A=A8=E7=81=AB?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=A0=E9=99=A4=E5=85=A8=E9=83=A8=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=9A=84bug=EF=BC=8C=E6=B6=88=E9=98=B2=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E7=BB=B4=E6=8A=A4=E6=98=AF=E5=90=A6=E6=A0=87=E7=82=B9?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/datasource/firemanager/FirePonitMapper.xml        | 4 ++--
 .../datasource/highriskwork/BusHotworkCfdExamineMapper.xml    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

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'