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 - tbd.del_flage = 0 + tbd.del_flag= 0 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 - 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 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 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