From 575eb472ceb910f97ab6f3d32b539b68584b9ce0 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Wed, 22 Jul 2026 11:17:58 +0800
Subject: [PATCH] =?UTF-8?q?chore(build):=20=E5=8F=AF=E8=A7=86=E5=8C=96?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F-=E6=B6=88=E9=98=B2=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcGbsServicer/command/query/ControlRoomQueryExe.java      | 4 +---
 .../zcloud/zcGbsServicer/command/query/PumpRoomQueryExe.java  | 4 +---
 .../zcGbsServicer/command/query/RescueTeamQueryExe.java       | 4 +---
 .../zcGbsServicer/command/query/WaterSourceQueryExe.java      | 4 +---
 .../java/com/zcloud/zcGbsServicer/dto/PumpRoomScreenQry.java  | 2 +-
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/ControlRoomQueryExe.java b/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/ControlRoomQueryExe.java
index d4654d3..4d9da8d 100644
--- a/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/ControlRoomQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/ControlRoomQueryExe.java
@@ -96,9 +96,7 @@ public class ControlRoomQueryExe {
     }
 
     public PageResponse<ControlRoomScreenCO> listScreen(ControlRoomScreenQry qry) {
-        if (qry == null || (qry.getCorpinfoId() == null && qry.getPortArea() == null)) {
-            throw new BizException("企业id和港区至少传一个");
-        }
+
         Map<String, Object> params = PageQueryHelper.toHashMap(qry);
         IPage<ControlRoomDO> page = new Query<ControlRoomDO>().getPage(params);
         PageResponse<ControlRoomDO> pageResponse = controlRoomRepository.listScreen(page, params);
diff --git a/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/PumpRoomQueryExe.java b/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/PumpRoomQueryExe.java
index bf9fce1..f01130e 100644
--- a/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/PumpRoomQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/PumpRoomQueryExe.java
@@ -82,9 +82,7 @@ public class PumpRoomQueryExe {
     }
 
     public PageResponse<PumpRoomScreenCO> listScreen(PumpRoomScreenQry qry) {
-        if (qry == null || (qry.getCorpinfoId() == null && qry.getPortArea() == null)) {
-            throw new BizException("企业id和港区至少传一个");
-        }
+
         Map<String, Object> params = PageQueryHelper.toHashMap(qry);
         IPage<PumpRoomDO> page = new Query<PumpRoomDO>().getPage(params);
         PageResponse<PumpRoomDO> pageResponse = pumpRoomRepository.listScreen(page, params);
diff --git a/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/RescueTeamQueryExe.java b/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/RescueTeamQueryExe.java
index cd1d894..8419808 100644
--- a/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/RescueTeamQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/RescueTeamQueryExe.java
@@ -70,9 +70,7 @@ public class RescueTeamQueryExe {
      * 鍙鍖栧ぇ灞忔秷闃叉晳鎻撮槦鏌ヨ
      */
     public PageResponse<RescueTeamScreenCO> listScreen(RescueTeamScreenQry qry) {
-        if (qry == null || (qry.getCorpinfoId() == null && qry.getPortArea() == null)) {
-            throw new BizException("企业id和港区至少传一个");
-        }
+
         Map<String, Object> params = PageQueryHelper.toHashMap(qry);
         IPage<RescueTeamDO> page = new Query<RescueTeamDO>().getPage(params);
         PageResponse<RescueTeamDO> pageResponse = rescueTeamRepository.listScreen(page, params);
diff --git a/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/WaterSourceQueryExe.java b/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/WaterSourceQueryExe.java
index 77e6c07..a1cd8d1 100644
--- a/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/WaterSourceQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/WaterSourceQueryExe.java
@@ -52,9 +52,7 @@ public class WaterSourceQueryExe {
     }
 
     public PageResponse<WaterSourceScreenCO> listScreen(WaterSourceScreenQry qry) {
-        if (qry == null || (qry.getCorpinfoId() == null && qry.getPortArea() == null)) {
-            throw new BizException("企业id和港区至少传一个");
-        }
+
         Map<String, Object> params = PageQueryHelper.toHashMap(qry);
         IPage<WaterSourceDO> page = new Query<WaterSourceDO>().getPage(params);
         PageResponse<WaterSourceDO> pageResponse = waterSourceRepository.listScreen(page, params);
diff --git a/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/PumpRoomScreenQry.java b/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/PumpRoomScreenQry.java
index eb0c2a3..59683b7 100644
--- a/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/PumpRoomScreenQry.java
+++ b/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/PumpRoomScreenQry.java
@@ -13,6 +13,6 @@ public class PumpRoomScreenQry extends PageQuery {
     @ApiModelProperty(value = "企业id", name = "corpinfoId")
     private Long corpinfoId;
 
-    @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea")
+    @ApiModelProperty(value = "港区，2:秦皇岛东,3:秦皇岛西,为空是查询所有的", name = "portArea")
     private Integer portArea;
 }