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)) {