From f925f2604233197738307101b8a8ec65c2e3e3d6 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 17 Mar 2026 17:50:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=20order=20sql=20?=
 =?UTF-8?q?=E6=B3=A8=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/dataset/manage/DatasetDataManage.java  | 13 +++++--------
 .../java/io/dataease/engine/trans/Order2SQLObj.java |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
index 97a80a0952..2e5c36b5c4 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
@@ -127,7 +127,7 @@ public class DatasetDataManage {
                 Map map = JsonUtil.parseObject(datasourceSchemaDTO.getConfiguration(), Map.class);
                 if (!datasourceRequest.getIsCross()) {
                     if (ObjectUtils.isNotEmpty(map.get("schema"))) {
-                        sql = sql.replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + datasourceSchemaDTO.getSchemaAlias() + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX, String.format(format, map.get("schema").toString()) );
+                        sql = sql.replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + datasourceSchemaDTO.getSchemaAlias() + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX, String.format(format, map.get("schema").toString()));
                     } else {
                         sql = sql.replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + datasourceSchemaDTO.getSchemaAlias() + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX + "\\.", "");
                     }
@@ -154,8 +154,7 @@ public class DatasetDataManage {
                     sql = SqlUtils.addSchema(originSql, tableSchema);
                 }
             }
-            datasourceRequest.setQuery(sql.replaceAll("\r\n", " ")
-                    .replaceAll("\n", " "));
+            datasourceRequest.setQuery(sql.replaceAll("\r\n", " ").replaceAll("\n", " "));
             logger.debug("calcite data table field sql: " + datasourceRequest.getQuery());
             // 获取数据源表的原始字段
             if (StringUtils.equalsIgnoreCase(type, DatasetTableType.DB)) {
@@ -538,8 +537,7 @@ public class DatasetDataManage {
                         if (desensitizationList.keySet().contains(fields.get(j).getDataeaseName())) {
                             obj.put(fields.get(j).getDataeaseName(), ChartDataBuild.desensitizationValue(desensitizationList.get(fields.get(j).getDataeaseName()), String.valueOf(res)));
                         } else {
-                            obj.put(ObjectUtils.isNotEmpty(fields.get(j).getDataeaseName()) ?
-                                    fields.get(j).getDataeaseName() : fields.get(j).getOriginName(), res);
+                            obj.put(ObjectUtils.isNotEmpty(fields.get(j).getDataeaseName()) ? fields.get(j).getDataeaseName() : fields.get(j).getOriginName(), res);
                         }
                     }
                 }
@@ -564,8 +562,7 @@ public class DatasetDataManage {
             if (ObjectUtils.isEmpty(dto)) {
                 if (Objects.equals(datasetTableFieldDTO.getExtField(), ExtFieldConstant.EXT_NORMAL)) {
                     for (DatasetTableFieldDTO fieldDTO : unionFields) {
-                        if (Objects.equals(datasetTableFieldDTO.getDatasetTableId(), fieldDTO.getDatasetTableId())
-                                && Objects.equals(datasetTableFieldDTO.getOriginName(), fieldDTO.getOriginName())) {
+                        if (Objects.equals(datasetTableFieldDTO.getDatasetTableId(), fieldDTO.getDatasetTableId()) && Objects.equals(datasetTableFieldDTO.getOriginName(), fieldDTO.getOriginName())) {
                             datasetTableFieldDTO.setDataeaseName(fieldDTO.getDataeaseName());
                             datasetTableFieldDTO.setFieldShortName(fieldDTO.getFieldShortName());
                         }
@@ -1004,7 +1001,7 @@ public class DatasetDataManage {
             }
             DeSortField deSortField = new DeSortField();
             BeanUtils.copyBean(deSortField, field);
-            deSortField.setOrderDirection(request.getSort());
+            deSortField.setOrderDirection(request.getSort().equalsIgnoreCase("asc") ? "asc" : "desc");
             datasetGroupInfoDTO.setSortFields(Collections.singletonList(deSortField));
             sortDistinct = false;
         }
diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/Order2SQLObj.java b/core/core-backend/src/main/java/io/dataease/engine/trans/Order2SQLObj.java
index df6e0307b5..523eb61933 100644
--- a/core/core-backend/src/main/java/io/dataease/engine/trans/Order2SQLObj.java
+++ b/core/core-backend/src/main/java/io/dataease/engine/trans/Order2SQLObj.java
@@ -123,7 +123,7 @@ public class Order2SQLObj {
         SQLObj result = SQLObj.builder()
                 .orderField(String.format(SQLConstants.FIELD_DOT, originField))
                 .orderAlias(String.format(SQLConstants.FIELD_DOT, originField))
-                .orderDirection(f.getOrderDirection()).build();
+                .orderDirection(f.getOrderDirection().equalsIgnoreCase("asc") ? "asc" : "desc").build();
         return result;
     }