From 8208c099beb910e98ea1134723ba8374c05d156a Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Tue, 2 Apr 2024 09:31:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/DeviceBdMapper.xml            | 4 ++--
 .../src/main/resources/mapper/ScIndexMapper.xml             | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
index 1e3f67c..2ef7cfe 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
@@ -201,7 +201,7 @@
         LEFT JOIN sys_dict sd2 ON sd2.dict_code = tbd.status
         LEFT JOIN tb_area sa ON tbd.area_id = sa.area_id
         <where>
-            tbd.del_flage = 0
+            tbd.del_flag= 0
             <if test="keyWord!=null and keyWord!=''">
                 AND (
                     INSTR(tpb.bd_name,#{keyWord}) > 0
@@ -215,7 +215,7 @@
             SELECT COUNT(*) FROM tb_bd_device tbd WHERE device_code = #{deviceCode} AND del_flage = 0
         </if>
         <if test="deviceId != null and deviceId != ''">
-            SELECT COUNT(*) FROM tb_bd_device tbd WHERE device_code = #{deviceCode} AND device_id != #{deviceId} AND tbd.del_flage = 0
+            SELECT COUNT(*) FROM tb_bd_device tbd WHERE device_code = #{deviceCode} AND device_id != #{deviceId} AND tbd.del_flag = 0
         </if>
     </select>
     <!--边带设备详情-->
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml
index 11547f9..faaa6cc 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml
@@ -67,7 +67,7 @@
         INNER JOIN tb_area ta ON tbd.area_id = ta.area_id AND ta.del_flag = 0 AND ta.area_type = '0'
         LEFT JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id AND tdd.del_flag = 0
         LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id
-        WHERE tbd.del_flage = 0
+        WHERE tbd.del_flag = 0
     </select>
     <!--设备状态 目前只查询边带设备-->
     <select id="deviceStatus" resultType="java.util.Map">
@@ -77,7 +77,7 @@
         FROM tb_bd_device tbd
         INNER JOIN tb_pro_bd tpb ON tpb.id = tbd.bd_id AND tpb.del_flag = 0
         INNER JOIN tb_project tp on tpb.bid_code = tp.bid_code AND tp.del_flag = 0
-        WHERE tbd.del_flage = 0
+        WHERE tbd.del_flag = 0
     </select>
     <!--工程安全隐患分析-->
     <select id="potentialSafetyHazard" resultType="java.util.Map">
@@ -107,7 +107,7 @@
     <select id="allDeviceStatus" resultType="java.util.Map">
         SELECT tbd.device_id AS id, IF(tbd.status = '801', '1', '0') AS status
         FROM tb_bd_device tbd
-        WHERE tbd.del_flage = 0
+        WHERE tbd.del_flag = 0
     UNION ALL
         SELECT td.device_id AS id,
                IF(on_line = '1', '1', '0') AS status