github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 03:22:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 修复解析sql时，替换变量错误

Browse Source
This commit is contained in:
taojinlong 2025-02-05 16:46:45 +08:00 committed by taojinlong
parent 828079c36c
commit 79c79745de
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java
View File

@ -181,7 +181,7 @@ public class SqlparserUtils {
sysParams.add(sysParam); sysParams.add(sysParam);
} }
} }
if(!hasVariables){ if(!hasVariables && !sql.contains(SubstitutedParams)){
return sql; return sql;
} }
Statement statement = CCJSqlParserUtil.parse(tmpSql); Statement statement = CCJSqlParserUtil.parse(tmpSql);

2
core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java
View File

@ -84,7 +84,7 @@ public class ApiUtils {
fieldList = getTableFields(apiDefinition); fieldList = getTableFields(apiDefinition);
result.put("fieldList", fieldList); result.put("fieldList", fieldList);
if (apiDefinition.getRequest().getPage().getPageType().equalsIgnoreCase("pageNumber")) { 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()); int beginPage = Integer.valueOf(apiDefinition.getRequest().getPage().getRequestData().get(0).getParameterDefaultValue());
if (apiDefinition.getRequest().getPage().getResponseData().get(0).getResolutionPathType().equalsIgnoreCase("totalNumber")) { if (apiDefinition.getRequest().getPage().getResponseData().get(0).getResolutionPathType().equalsIgnoreCase("totalNumber")) {
pageCount = pageCount / Integer.valueOf(apiDefinition.getRequest().getPage().getRequestData().get(1).getParameterDefaultValue()) + 1; pageCount = pageCount / Integer.valueOf(apiDefinition.getRequest().getPage().getRequestData().get(1).getParameterDefaultValue()) + 1;