diff --git a/dinky-admin/src/main/java/org/dinky/mybatis/util/ProTableUtil.java b/dinky-admin/src/main/java/org/dinky/mybatis/util/ProTableUtil.java index 7d1b9faaa6..f244ab4d60 100644 --- a/dinky-admin/src/main/java/org/dinky/mybatis/util/ProTableUtil.java +++ b/dinky-admin/src/main/java/org/dinky/mybatis/util/ProTableUtil.java @@ -74,6 +74,10 @@ private static void buildDelete(QueryWrapper wrapper, boolean camelToUndersco private static void buildSort( String sortField, String sortValue, QueryWrapper wrapper, boolean camelToUnderscore) { if (sortField != null && sortValue != null) { + // 过滤无效的排序字段 + if ("undefined".equalsIgnoreCase(sortField) || "null".equalsIgnoreCase(sortField) || sortField.trim().isEmpty()) { + return; + } if (camelToUnderscore) { sortField = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortField); } diff --git a/dinky-metadata/dinky-metadata-doris/src/main/java/org/dinky/metadata/convert/DorisTypeConvert.java b/dinky-metadata/dinky-metadata-doris/src/main/java/org/dinky/metadata/convert/DorisTypeConvert.java index 2204b7f26a..7bbc5be9e4 100644 --- a/dinky-metadata/dinky-metadata-doris/src/main/java/org/dinky/metadata/convert/DorisTypeConvert.java +++ b/dinky-metadata/dinky-metadata-doris/src/main/java/org/dinky/metadata/convert/DorisTypeConvert.java @@ -82,7 +82,12 @@ public String convertToDB(ColumnType columnType) { return "varchar"; } switch (columnType.getValue()) { - case DECIMAL: + case DECIMAL: + if (columnType.getLogicalType() instanceof org.dinky.data.types.DecimalType) { + org.dinky.data.types.DecimalType decimalType = + (org.dinky.data.types.DecimalType) columnType.getLogicalType(); + return String.format("decimal(%d,%d)", decimalType.getPrecision(), decimalType.getScale()); + } return "decimal"; case BIGINT: return "bigint"; diff --git a/dinky-metadata/dinky-metadata-starrocks/src/main/java/org/dinky/metadata/convert/StarRocksTypeConvert.java b/dinky-metadata/dinky-metadata-starrocks/src/main/java/org/dinky/metadata/convert/StarRocksTypeConvert.java index efd20ffe41..72815cea66 100644 --- a/dinky-metadata/dinky-metadata-starrocks/src/main/java/org/dinky/metadata/convert/StarRocksTypeConvert.java +++ b/dinky-metadata/dinky-metadata-starrocks/src/main/java/org/dinky/metadata/convert/StarRocksTypeConvert.java @@ -77,6 +77,11 @@ public String convertToDB(ColumnType columnType) { } switch (columnType.getValue()) { case DECIMAL: + if (columnType.getLogicalType() instanceof org.dinky.data.types.DecimalType) { + org.dinky.data.types.DecimalType decimalType = + (org.dinky.data.types.DecimalType) columnType.getLogicalType(); + return String.format("decimal(%d,%d)", decimalType.getPrecision(), decimalType.getScale()); + } return "decimal"; case BIGINT: return "bigint";