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 9dd307c471..381362aadc 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -102,8 +102,13 @@ public class ChartViewService {
         DatasourceRequest datasourceRequest = new DatasourceRequest();
         datasourceRequest.setDatasource(ds);
         DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(table.getInfo(), DataTableInfoDTO.class);
-        datasourceRequest.setTable(dataTableInfoDTO.getTable());
-        datasourceRequest.setQuery(getSQL(ds.getType(), dataTableInfoDTO.getTable(), xAxis, yAxis));
+        if (StringUtils.equalsIgnoreCase(table.getType(), "db")) {
+            datasourceRequest.setTable(dataTableInfoDTO.getTable());
+            datasourceRequest.setQuery(getSQL(ds.getType(), dataTableInfoDTO.getTable(), xAxis, yAxis));
+        } else if (StringUtils.equalsIgnoreCase(table.getType(), "sql")) {
+            datasourceRequest.setQuery(getSQL(ds.getType(), " (" + dataTableInfoDTO.getSql() + ") AS tmp ", xAxis, yAxis));
+        }
+
         List<String[]> data = datasourceProvider.getData(datasourceRequest);
 
         // todo 处理结果,目前做一个单系列图表，后期图表组件再扩展
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index fae8ba496e..eb7e2576d4 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -157,7 +157,7 @@ public class DataSetTableService {
             datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT 0,10");// todo limit
         } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "sql")) {
             String sql = dataTableInfoDTO.getSql();
-            datasourceRequest.setQuery(sql);// todo 因为编辑可能取消某些字段展示，这里sql看看怎么处理
+            datasourceRequest.setQuery(createQuerySQL(ds.getType(), " (" + sql + ") AS tmp ", fieldArray));// todo 因为编辑可能取消某些字段展示，这里sql看看怎么处理
         }
 
         List<String[]> data = new ArrayList<>();