diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
index e10dbd0a..5d73b43a 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
@@ -125,6 +125,9 @@ public class BsSgcDfSafeJbxxController extends BaseController {
         String adcdQx = sp.getData().getAdcdQx();
         String dikeCode = sp.getData().getDikeCode();
         BsSgcDfSafeJbxx data = sp.getData();
+        if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getDikeCode())){
+            return page;
+        }
         page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
                     Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class)
                             .eq(StringUtils.isNotEmpty(data.getDikeCode()),BsSgcDfSafeJbxx::getDikeCode,data.getDikeCode())
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
index 3748aa03..aaf67c6c 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
@@ -123,6 +123,9 @@ public class BsSgcSzSafeJbxxController extends BaseController {
         String adcd = data.getAdcd();
         String adcdQx = data.getAdcdQx();
         String wagaCode = data.getWagaCode();
+        if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode())){
+            return page;
+        }
         page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
                     Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class)
                             .eq(StringUtils.isNotEmpty(data.getWagaCode()),BsSgcSzSafeJbxx::getWagaCode,data.getWagaCode())