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>