From 964410eb0ff9e452c4981e8a8ac1549ba2abbab3 Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Sun, 28 Apr 2024 16:22:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E6=9C=BA=E9=A2=84=E8=AD=A6=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E6=94=B6=E8=B4=B9=E7=AB=99=E7=B1=BB=E5=9E=8B=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/business/DcPerceivedEventsWarningMapper.xml    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
index 93277c96..de518f99 100644
--- a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
@@ -28,7 +28,7 @@
         where warning.`id`=#{id}
     </select>
     <select id="selectPerceivedEventsList" resultType="com.zc.business.domain.DcWarning">
-        SELECT facility.facility_name,   warning.`id`,warning.`stake_mark`, warning.`direction`,facility.facility_name,
+        SELECT facility.facility_name,   warning.`id`,warning.`stake_mark`, warning.`direction`,
         mark.longitude,mark.latitude,warning.lane,duration,
         warning.`dept_id`,warning.`warning_state`,warning.`warning_time`,
         warning.`user_id`, warning.`warning_source`,warning.`warning_level`,
@@ -36,7 +36,7 @@
         warning.`warning_type`,warning.`warning_subclass`,warning.`warning_title`,
         warning.`other_config` FROM dc_warning AS warning
         left JOIN dc_stake_mark AS mark ON mark.stake_mark=warning.stake_mark and mark.direction=warning.direction
-        left join dc_facility as facility on facility.stake_mark=warning.stake_mark
+        left join dc_facility as facility on facility.stake_mark=warning.stake_mark and facility.facility_type=1
         <where>
             <if test="warningSource == null  || warningSource == ''"> and warning.warning_source !=6</if>
             <if test="warningSource != null  and warningSource != ''"> and warning.warning_source = #{warningSource}</if>
@@ -60,7 +60,7 @@
        order by warning.warning_time desc
     </select>
     <select id="selectNonAutomaticWarningList" resultType="com.zc.business.domain.DcWarning">
-        SELECT facility.facility_name,   warning.`id`,warning.`stake_mark`, warning.`direction`,facility.facility_name,
+        SELECT facility.facility_name,   warning.`id`,warning.`stake_mark`, warning.`direction`,
         mark.longitude,mark.latitude,warning.lane,duration,
         warning.`dept_id`,warning.`warning_state`,warning.`warning_time`,
         warning.`user_id`, warning.`warning_source`,warning.`warning_level`,
@@ -68,7 +68,7 @@
         warning.`warning_type`,warning.`warning_subclass`,warning.`warning_title`,
         warning.`other_config` FROM dc_warning AS warning
         left JOIN dc_stake_mark AS mark ON mark.stake_mark=warning.stake_mark and mark.direction=warning.direction
-        left join dc_facility as facility on facility.stake_mark=warning.stake_mark
+        left join dc_facility as facility on facility.stake_mark=warning.stake_mark and facility.facility_type=1
         <where>
             <if test="warningSource != null  and warningSource != ''"> and warning.warning_source = #{warningSource}</if>
             <if test="warningState != null  and warningState != ''"> and warning.warning_state = #{warningState}</if>