From dd4d4eadbd9f669b224d23ffbc74e9f22b791d76 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Fri, 10 May 2024 16:24:23 +0800
Subject: [PATCH] =?UTF-8?q?app=E6=A3=80=E6=9F=A5=E8=A1=A8=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=B8=85=E5=8D=95=E6=8E=92=E6=9F=A5=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=A9=BA=E7=9A=84=E6=B6=88=E9=98=B2=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/datasource/firemanager/FireCheckListMapper.xml      | 2 ++
 .../mybatis/datasource/firemanager/FireRecordMapper.xml         | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml
index eafe482d..10c601e6 100644
--- a/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml
+++ b/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml
@@ -346,6 +346,7 @@
                  FROM bus_fire_checklist AS cl
                  LEFT JOIN bus_fire_device_prepared AS fpc ON cl.FIRE_CHECK_ID = fpc.FIRE_CHECK_ID
                  LEFT JOIN bus_fire_point_prepared fpp on cl.FIRE_CHECK_ID = fpp.FIRE_CHECK_ID
+                 LEFT JOIN bus_fire_point fp ON fp.FIRE_POINT_ID = fpp.FIRE_POINT_ID
                  LEFT JOIN sys_user AS su ON cl.USER_ID = su.USER_ID
                  LEFT JOIN oa_department AS od ON cl.DEPARTMENT_ID = od.DEPARTMENT_ID
                  LEFT JOIN sys_dictionaries ON cl.FIRE_CHECK_TYPE = sys_dictionaries.BIANMA
@@ -355,6 +356,7 @@
               AND fpp.FIRE_POINT_ID = #{pd.pointId}
           </if>
         and fpp.ISDELETE = 0
+        and fp.ISDELETE = 0
         AND fpc.ISDELETE = 0
         <if test="pd.roleLevel != null and pd.roleLevel != ''"><!-- 权限显示 -->
             <choose>
diff --git a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
index e5525d2d..29996134 100644
--- a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
+++ b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
@@ -712,6 +712,7 @@
           and frc.FIRE_RECORD_ID = #{FIRE_RECORD_ID}
           AND frp.ISDELETE = 0
           AND fpp.ISDELETE = 0
+          AND t.FIRE_POINT_ID IS NOT NULL
         order by t.FIRE_POINT_NAME
     </select>
     <select id="getRecordDeviceByEid" resultType="com.zcloud.entity.PageData">