From a6baf37cbe4be53e89ad767a1e30cc304c1966dd Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 14 Jan 2025 12:00:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E6=97=A7=E7=89=88=E6=9C=ACAPI?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=9C=A8=E5=8D=87=E7=BA=A7=E5=88=B0?= =?UTF-8?q?v2.10.4=E7=89=88=E6=9C=AC=E5=90=8E=E6=97=A0=E6=B3=95=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E5=90=8C=E6=AD=A5=20#14682?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/datasource/provider/ApiUtils.java | 2 +- .../main/java/io/dataease/api/ds/vo/ApiDefinitionRequest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java index c6aef9823f..c7ae295f99 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java @@ -79,7 +79,7 @@ public class ApiUtils { if (apiDefinition == null) { DEException.throwException("未找到"); } - if (apiDefinition.getRequest().getPage() != null && !apiDefinition.getRequest().getPage().getPageType().equalsIgnoreCase("empty")) { + if (apiDefinition.getRequest().getPage() != null && apiDefinition.getRequest().getPage().getPageType() != null && !apiDefinition.getRequest().getPage().getPageType().equalsIgnoreCase("empty")) { String response = execHttpRequest(false, apiDefinition, apiDefinition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout(), params(datasourceRequest)); fieldList = getTableFields(apiDefinition); result.put("fieldList", fieldList); diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ApiDefinitionRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ApiDefinitionRequest.java index 4a4eb81918..fe956808b2 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ApiDefinitionRequest.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ApiDefinitionRequest.java @@ -27,7 +27,7 @@ public class ApiDefinitionRequest { @Data public static class Page { - private String pageType; + private String pageType = "empty"; private List requestData; private List responseData; }