diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java
index cdf28be8..2e5fed07 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java
@@ -27,10 +27,10 @@ public interface BsSgcDfJbxxMapper extends BaseMapper<BsSgcDfJbxx> {
             "from bs_sgc_df_jbxx df ",
             "left join bs_sgc_df_gcgl pj on pj.dike_code = df.dike_code ",
             "where 1=1 ",
-            "<if test='dikeName != null'>",
+            "<if test='dikeName != null  and dikeName != \"\"'>",
             "and dike_name = #{dikeName} ",
             "</if>",
-            "<if test='dikeType != null'>",
+            "<if test='dikeType != null and dikeType != \"\"'>",
             "and dike_type = #{dikeType} ",
             "</if>",
             "</script>"
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java
index 07486d5b..fa4e61a2 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java
@@ -20,10 +20,20 @@ import java.util.Date;
  */
 @Repository
 public interface BsSgcSzGcdaMapper extends BaseMapper<BsSgcSzGcda> {
-    @Select(value = "select df.waga_code waga_code, df.waga_name waga_name, pj.engineering_management_unit engineering_management_unit, pj.water_administrative_department water_administrative_department " +
-            "from BsSgcSzGcda df " +
-            "left join bs_sgc_sz_gcgl pj on pj.waga_code = df.waga_code " +
-            "where waga_name = #{wagaName} and waga_type = #{wagaType}")
+    @Select({
+            "<script>",
+            "select df.waga_code waga_code, df.waga_name waga_name, pj.engineering_management_unit engineering_management_unit, pj.water_administrative_department water_administrative_department ",
+            "from BsSgcSzGcda df ",
+            "left join bs_sgc_sz_gcgl pj on pj.waga_code = df.waga_code ",
+            "where 1=1 ",
+            "<if test='wagaName != null and wagaName != \"\"'>",
+            "and waga_name = #{wagaName} ",
+            "</if>",
+            "<if test='wagaType != null and wagaType != \"\"'>",
+            "and waga_type = #{wagaType} ",
+            "</if>",
+            "</script>"
+    })
     @Results({
             @Result(property = "wagaCode", column = "waga_code"),
             @Result(property = "wagaName", column = "waga_name"),