From 780dce229495c05894d2e2365e13829a8d5a7f59 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 22 Jul 2026 11:25:47 +0800 Subject: [PATCH] =?UTF-8?q?refactor(project):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command/query/project/KeyProjectQueryExe.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java index e0553e4..5f50132 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java @@ -282,9 +282,7 @@ public class KeyProjectQueryExe { } public PageResponse largeScreenPage(KeyProjectLargeScreenPageQry qry) { - if (qry == null || (qry.getCorpinfoId() == null && qry.getPortArea() == null)) { - throw new BizException("企业id和港区至少传一个"); - } + Map params = PageQueryHelper.toHashMap(qry); PageResponse pageResponse = keyProjectRepository.largeScreenPage(params); List result = keyProjectCoConvertor.converLargeScreenDOsToCOs(pageResponse.getData()); @@ -292,9 +290,7 @@ public class KeyProjectQueryExe { } public KeyProjectLargeScreenProjectStatisticsCO largeScreenProjectStatistics(KeyProjectLargeScreenProjectStatisticsQry qry) { - if (qry == null || (qry.getCorpinfoId() == null && qry.getPortArea() == null)) { - throw new BizException("企业id和港区至少传一个"); - } + Map params = PageQueryHelper.toHashMap(qry); KeyProjectLargeScreenProjectStatisticsDO data = keyProjectRepository.largeScreenProjectStatistics(params); KeyProjectLargeScreenProjectStatisticsCO result = new KeyProjectLargeScreenProjectStatisticsCO(); @@ -307,9 +303,7 @@ public class KeyProjectQueryExe { } public List largeScreenDepartmentStatistics(KeyProjectLargeScreenDepartmentStatisticsQry qry) { - if (qry == null || (qry.getCorpinfoId() == null && qry.getPortArea() == null)) { - throw new BizException("企业id和港区至少传一个"); - } + Map params = PageQueryHelper.toHashMap(qry); List dataList = keyProjectRepository.largeScreenDepartmentStatistics(params); if (CollUtil.isEmpty(dataList)) {