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 2f07234..3f66351 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
@@ -100,11 +100,11 @@
- DELETE FROM tb_pro_bd WHERE id = #{id}
+ UPDATE tb_pro_bd SET del_flag = 0 WHERE id = #{id}
- DELETE FROM tb_bd_device WHERE device_id = #{id}
+ UPDATE tb_bd_device SET del_flage = 1 WHERE device_id = #{id}
@@ -123,9 +123,10 @@
FROM tb_pro_bd tpb
LEFT JOIN sys_dict sd ON sd.dict_code = tpb.bd_type
LEFT JOIN sys_dict sd2 ON sd2.dict_code = tpb.type_code
- LEFT JOIN tb_project tp ON tp.bid_code = tpb.bid_code
+ LEFT JOIN tb_project tp ON tp.bid_code = tpb.bid_code AND tp.del_flag = 0
LEFT JOIN t_pro_gt tpg ON tpg.gt_id = tpb.gt_id
+ tpb.del_flag = 0
AND (
INSTR(tpb.bd_name,#{keyWord}) > 0 OR
@@ -139,10 +140,10 @@
@@ -160,7 +161,7 @@
- SELECT COUNT(*) FROM tb_project tp WHERE bid_code = #{bidCode}
+ SELECT COUNT(*) FROM tb_project tp WHERE bid_code = #{bidCode} AND del_flag = 0
- SELECT COUNT(*) FROM tb_project tp WHERE bid_code = #{bidCode} AND pro_id != #{proId}
+ SELECT COUNT(*) FROM tb_project tp WHERE bid_code = #{bidCode} AND pro_id != #{proId} AND del_flag = 0
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml
index 4c92b37..b621d53 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml
@@ -64,6 +64,7 @@
FROM tb_project tp
LEFT JOIN sys_build sb ON tp.org = sb.org_id
+ tp.del_flag = 0
AND (
INSTR(tp.pro_name,#{keyWord}) > 0 OR
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml
index ddf934b..78f25b1 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml
@@ -86,6 +86,7 @@
pro_name AS name,
pro_type AS proType
FROM tb_project
+ WHERE del_flag = 0
@@ -104,6 +105,7 @@
SELECT id,bd_name AS name,bid_code AS bidCode,gt_id AS gtId
FROM tb_pro_bd
+ del_flag = 0
AND bid_code = #{bidCode}