Merge remote-tracking branch 'origin/pet' into pet

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>

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">