From 79c79745de0a4c1618f0c05ceef68bf80f3fbcbc Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 5 Feb 2025 16:46:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A7=A3=E6=9E=90sql?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=9B=BF=E6=8D=A2=E5=8F=98=E9=87=8F=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/commons/utils/SqlparserUtils.java | 2 +- .../src/main/java/io/dataease/datasource/provider/ApiUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java b/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java index a90825f765..7230b9843c 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java +++ b/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java @@ -181,7 +181,7 @@ public class SqlparserUtils { sysParams.add(sysParam); } } - if(!hasVariables){ + if(!hasVariables && !sql.contains(SubstitutedParams)){ return sql; } Statement statement = CCJSqlParserUtil.parse(tmpSql); 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 6b9cdd1bad..1549cd0b15 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 @@ -84,7 +84,7 @@ public class ApiUtils { fieldList = getTableFields(apiDefinition); result.put("fieldList", fieldList); if (apiDefinition.getRequest().getPage().getPageType().equalsIgnoreCase("pageNumber")) { - int pageCount = Integer.valueOf(JsonPath.read(response, apiDefinition.getRequest().getPage().getResponseData().get(0).getResolutionPath())); + int pageCount = Integer.valueOf(JsonPath.read(response, apiDefinition.getRequest().getPage().getResponseData().get(0).getResolutionPath()).toString()); int beginPage = Integer.valueOf(apiDefinition.getRequest().getPage().getRequestData().get(0).getParameterDefaultValue()); if (apiDefinition.getRequest().getPage().getResponseData().get(0).getResolutionPathType().equalsIgnoreCase("totalNumber")) { pageCount = pageCount / Integer.valueOf(apiDefinition.getRequest().getPage().getRequestData().get(1).getParameterDefaultValue()) + 1;