From 12e3d337a4eda695b50ea3ce72122adef0178a8d Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 25 Mar 2024 17:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=B9=E5=B8=A6=E7=AE=A1=E7=90=86=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/DeviceBdMapper.xml          | 8 +++++++-
 .../src/main/resources/mapper/base/SelectMapper.xml       | 6 ++----
 2 files changed, 9 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 d4203be..2f07234 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
@@ -180,7 +180,13 @@
         LEFT JOIN sys_dict sd ON sd.dict_code = tbd.devic_type
         LEFT JOIN sys_dict sd2 ON sd2.dict_code = tbd.status
         LEFT JOIN sys_area sa ON tbd.area_id = sa.area_id
-        WHERE tbd.bd_id = #{id}
+        <where>
+            <if test="keyWord!=null and keyWord!=''">
+                AND (
+                    INSTR(tpb.bd_name,#{keyWord}) > 0
+                )
+            </if>
+        </where>
     </select>
     <!--边带设备编码是否重复-->
     <select id="isDeviceCodeExist" resultType="java.lang.Integer">
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 0fb14ca..239fa52 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
@@ -93,9 +93,7 @@
                area_name AS name
         FROM sys_area
         <where>
-            <if test="bidCode !=null and bidCode!=''">
-                AND bid_code = #{bidCode}
-            </if>
+            bid_code = #{bidCode}
             <if test="gtId !=null and gtId!=''">
                 AND gt_id = #{gtId}
             </if>
@@ -103,7 +101,7 @@
     </select>
     <!--边带下拉选-->
     <select id="getBdLists" resultType="com.securitycontrol.entity.system.vo.SelectVo">
-        SELECT id,bd_name AS name,bd_code AS bidCode,gt_id AS gtId
+        SELECT id,bd_name AS name,bid_code AS bidCode,gt_id AS gtId
         FROM tb_pro_bd
         <where>
             <if test="bidCode!=null and bidCode !=''">