From e5ee83796023f9fd0578dd2818a2df9e529452d3 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 18 Mar 2024 10:26:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/base/ProMapper.xml              | 4 ++--
 .../src/main/resources/mapper/base/ProScheduleMapper.xml      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml
index 2d3859f..ebfc8cc 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml
@@ -267,10 +267,10 @@
             LEFT JOIN t_pro_gt tpg ON tgp.gx_id = tpg.gt_id
         </if>
         WHERE tgp.bid_code = #{bidCode}
-        <if test="proType == '变电'">
+        <if test="proType == '变电' and keyWord!='' and keyWord!=null">
            AND INSTR(sd.dict_name,#{keyWord}) > 0
         </if>
-        <if test="proType == '线路'">
+        <if test="proType == '线路' and keyWord!='' and keyWord!=null">
            AND INSTR(tpg.gt_name,#{keyWord}) > 0
         </if>
     </select>
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 2bc7e0f..1da4181 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
@@ -97,10 +97,10 @@
             LEFT JOIN t_pro_gt tpg ON tgp.gx_id = tpg.gt_id
         </if>
         WHERE tgp.bid_code = #{bidCode}
-        <if test="proType == '变电'">
+        <if test="proType == '变电' and keyWord!='' and keyWord!=null">
            AND INSTR(sd.dict_name,#{keyWord}) > 0
         </if>
-        <if test="proType == '线路'">
+        <if test="proType == '线路' and keyWord!='' and keyWord!=null">
            AND INSTR(tpg.gt_name,#{keyWord}) > 0
         </if>
     </select>