diff --git a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java index 6d4bdc0560..e1c882bdcb 100644 --- a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java @@ -1123,7 +1123,7 @@ public class OracleQueryProvider extends QueryProvider { whereValue = "'%" + value.get(0) + "%'"; } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) { if (request.getDatasetTableField().getDeType() == 1) { - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0)))); String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1)))); String st = String.format(OracleConstants.TO_DATE, "'" + startTime + "'", OracleConstants.DEFAULT_DATE_FORMAT); diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 29fc40726f..f5a8c0945d 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -675,7 +675,7 @@ public class ChartViewService { if (sqlVariables.stream().map(SqlVariableDetails::getVariableName).collect(Collectors.toList()).contains(parameter)) { hasParameters = true; } - if (parameter.contains("|DE|") && table.getId().equals(parameter.split("|DE|")[0]) && sqlVariables.stream().map(SqlVariableDetails::getVariableName).collect(Collectors.toList()).contains(parameter.split("|DE|")[1])) { + if (parameter.contains("|DE|") && table.getId().equals(parameter.split("\\|DE\\|")[0]) && sqlVariables.stream().map(SqlVariableDetails::getVariableName).collect(Collectors.toList()).contains(parameter.split("\\|DE\\|")[1])) { hasParameters = true; } } @@ -1611,13 +1611,13 @@ public class ChartViewService { for (String parameter : chartExtFilterRequest.getParameters()) { if(parameter.contains("|DE|")){ - if(!parameter.split("|DE|")[0].equals(table.getId())){ + if(!parameter.split("\\|DE\\|")[0].equals(table.getId())){ continue; } - List parameters = sqlVariables.stream().filter(item -> item.getVariableName().equalsIgnoreCase(parameter.split("|DE|")[1])).collect(Collectors.toList()); + List parameters = sqlVariables.stream().filter(item -> item.getVariableName().equalsIgnoreCase(parameter.split("\\|DE\\|")[1])).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(parameters)) { String filter = qp.transFilter(chartExtFilterRequest, parameters.get(0)); - sql = sql.replace("${" + parameter.split("|DE|")[1] + "}", filter); + sql = sql.replace("${" + parameter.split("\\|DE\\|")[1] + "}", filter); } }else { List parameters = sqlVariables.stream().filter(item -> item.getVariableName().equalsIgnoreCase(parameter)).collect(Collectors.toList()); diff --git a/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/frontend/src/views/panel/filter/filterMain/FilterControl.vue index 620b45ee7b..4370168890 100644 --- a/frontend/src/views/panel/filter/filterMain/FilterControl.vue +++ b/frontend/src/views/panel/filter/filterMain/FilterControl.vue @@ -181,13 +181,17 @@ export default { watch: { 'childViews.datasetParams': { handler(newName, oldName) { - if (this.attrs.parameters.length > 0) { + if (this.attrs.parameters.length > 0 && this.attrs.parameters[0].indexOf('|DE|') === -1) { const parameters = [] for (var i = 0; i < this.attrs.parameters.length; i++) { - for (var j = 0; j < this.childViews.datasetParams.length; j++) { - if (this.childViews.datasetParams[j].id.split('|DE|')[1] === this.attrs.parameters[i]) { - parameters.push(this.childViews.datasetParams[j].id) + if (this.attrs.parameters[i].indexOf('|DE|') === -1) { + for (var j = 0; j < this.childViews.datasetParams.length; j++) { + if (this.childViews.datasetParams[j].id.split('|DE|')[1] === this.attrs.parameters[i]) { + parameters.push(this.childViews.datasetParams[j].id) + } } + } else { + parameters.push(this.attrs.parameters[i]) } } this.attrs.parameters = parameters