diff --git a/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java index 44cd419834..1ee694ec4d 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java @@ -73,6 +73,7 @@ public class SqlserverQueryProvider extends QueryProvider { case "DATETIME": case "DATETIME2": case "DATETIMEOFFSET": + case "SMALLDATATIME": return DeTypeConstants.DE_TIME;// 时间 case "INT": case "MEDIUMINT": @@ -84,6 +85,7 @@ public class SqlserverQueryProvider extends QueryProvider { case "DOUBLE": case "DECIMAL": case "MONEY": + case "REAL": case "NUMERIC": return DeTypeConstants.DE_FLOAT;// 浮点 case "BIT": diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 0e0f9b8720..890d0dcd35 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -2759,7 +2759,7 @@ public class DataSetTableService { @Override public void visit(InExpression inExpression) { - if (inExpression.getRightExpression() != null && hasVariable(inExpression.getRightExpression().toString()) && inExpression.getRightExpression() instanceof ParenthesedExpressionList) { + if (inExpression.getRightExpression() != null && hasVariable(inExpression.getRightExpression().toString()) && !(inExpression.getRightExpression() instanceof ParenthesedSelect)) { stringBuilder.append(SubstitutedSql); return; }