diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelBasicForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelBasicForm.tsx
index c20788537..6d12e115c 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelBasicForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelBasicForm.tsx
@@ -4,7 +4,6 @@ import type { FormInstance } from 'antd/lib/form';
 import { getDbNames, getTables, getDimensionList } from '../../service';
 import { ISemantic } from '../../data';
 import FormItemTitle from '@/components/FormHelper/FormItemTitle';
-import { isString } from 'lodash';
 
 const FormItem = Form.Item;
 const { TextArea } = Input;
@@ -24,7 +23,7 @@ const ModelBasicForm: React.FC<Props> = ({
   mode = 'normal',
 }) => {
   const [currentDbLinkConfigId, setCurrentDbLinkConfigId] = useState<number>();
-  const [dbNameList, setDbNameList] = useState<any[]>([]);
+  const [dbNameList, setDbNameList] = useState<string[]>([]);
   const [tableNameList, setTableNameList] = useState<any[]>([]);
   const [loading, setLoading] = useState<boolean>(false);
   const [dimensionOptions, setDimensionOptions] = useState<{ label: string; value: number }[]>([]);
@@ -56,7 +55,7 @@ const ModelBasicForm: React.FC<Props> = ({
     const { code, data, msg } = await getDbNames(databaseId);
     setLoading(false);
     if (code === 200) {
-      const list = data?.resultList || [];
+      const list = data || [];
       setDbNameList(list);
     } else {
       message.error(msg);
@@ -70,7 +69,7 @@ const ModelBasicForm: React.FC<Props> = ({
     const { code, data, msg } = await getTables(currentDbLinkConfigId, databaseName);
     setLoading(false);
     if (code === 200) {
-      const list = data?.resultList || [];
+      const list = data || [];
       setTableNameList(list);
     } else {
       message.error(msg);
@@ -116,8 +115,8 @@ const ModelBasicForm: React.FC<Props> = ({
               }}
             >
               {dbNameList.map((item) => (
-                <Select.Option key={item.name} value={item.name}>
-                  {item.name}
+                <Select.Option key={item} value={item}>
+                  {item}
                 </Select.Option>
               ))}
             </Select>
@@ -129,8 +128,8 @@ const ModelBasicForm: React.FC<Props> = ({
           >
             <Select placeholder="请选择数据库/表" disabled={isEdit} showSearch>
               {tableNameList.map((item) => (
-                <Select.Option key={item.name} value={item.name}>
-                  {item.name}
+                <Select.Option key={item} value={item}>
+                  {item}
                 </Select.Option>
               ))}
             </Select>
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx
index 5922b574b..01bd94572 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx
@@ -285,6 +285,7 @@ const ModelCreateForm: React.FC<CreateFormProps> = ({
       setFields(fieldsClassifyList || []);
       return;
     }
+
     const columnFields: any[] = columns.map((item: IDataSource.IExecuteSqlColumn) => {
       const { type, nameEn, comment } = item;
       const oldItem =
@@ -404,12 +405,12 @@ const ModelCreateForm: React.FC<CreateFormProps> = ({
   const queryTableColumnList = async (databaseId: number, dbName: string, tableName: string) => {
     const { code, data, msg } = await getColumns(databaseId, dbName, tableName);
     if (code === 200) {
-      const list = data?.resultList || [];
+      const list = data || [];
       const columns = list.map((item: any, index: number) => {
-        const { dataType, name, comment } = item;
+        const { dataType, columnName, comment } = item;
         return {
           comment,
-          nameEn: name,
+          nameEn: columnName,
           type: dataType,
         };
       });
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx
index 949fee58f..f2e281d1a 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx
@@ -327,6 +327,7 @@ const ModelFieldForm: React.FC<Props> = ({
         return item.bizName.includes(filterValue);
       }) || []
     : fields;
+
   return (
     <>
       <div style={{ marginBottom: 10 }}>
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlDetail.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlDetail.tsx
index 5ad5968cb..963103f92 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlDetail.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/SqlDetail.tsx
@@ -18,8 +18,8 @@ import { isFunction } from 'lodash';
 import FullScreen from '@/components/FullScreen';
 import SqlEditor from '@/components/SqlEditor';
 import type { TaskResultItem, TaskResultColumn } from '../data';
-import { excuteSql } from '@/pages/SemanticModel/service';
-import type { StateType } from '../../model';
+import { executeSql, getColumnsBySql } from '@/pages/SemanticModel/service';
+
 import SqlParams from './SqlParams';
 import styles from '../style.less';
 import 'ace-builds/src-min-noconflict/ext-searchbox';
@@ -104,7 +104,7 @@ const SqlDetail: React.FC<IProps> = ({
   const [variableCollapsed, setVariableCollapsed] = useState<boolean>(true);
   const [sqlParams, setSqlParams] = useState<IDataSource.ISqlParamsItem[]>([]);
 
-  const [scriptColumns, setScriptColumns] = useState<any[]>([]);
+  const [scriptColumns, setScriptColumns] = useState<TaskResultColumn[]>([]);
 
   useEffect(() => {
     const list = databaseConfigList.map((item: ISemantic.IDatabaseItem) => {
@@ -186,21 +186,21 @@ const SqlDetail: React.FC<IProps> = ({
   const updateResultCols = (list: TaskResultItem[], columns: TaskResultColumn[]) => {
     if (list.length) {
       const widthMap = getKeyWidthMap(list);
-      const cols = columns.map(({ nameEn }) => {
+      const cols = columns.map(({ columnName }) => {
         return {
-          key: nameEn,
-          title: nameEn,
-          dataIndex: nameEn,
-          width: `${(widthMap[nameEn] as number) + 22}px`, // 字宽度 + 20px(比左右padding宽几像素，作为一个buffer值)
+          key: columnName,
+          title: columnName,
+          dataIndex: columnName,
+          width: `${(widthMap[columnName] as number) + 22}px`, // 字宽度 + 20px(比左右padding宽几像素，作为一个buffer值)
         };
       });
       setResultCols(cols);
     }
   };
 
-  const fetchTaskResult = (params) => {
+  const fetchTaskResult = (params: any, columnData = []) => {
     setResultTable(
-      params.resultList.map((item, index) => {
+      params.resultList.map((item: Record<string, string>, index: number) => {
         return {
           ...item,
           index,
@@ -212,8 +212,8 @@ const SqlDetail: React.FC<IProps> = ({
       pageSize: 20,
       total: params.resultList.length,
     });
-    setScriptColumns(params.columns);
-    updateResultCols(params.resultList, params.columns);
+    setScriptColumns(columnData);
+    updateResultCols(params.resultList, columnData);
   };
 
   const changePaging = (paging: Pagination) => {
@@ -243,14 +243,27 @@ const SqlDetail: React.FC<IProps> = ({
       return;
     }
     setResultTableLoading(true);
-    const { code, data, msg } = await excuteSql({
+    const { code, data, msg } = await executeSql({
       sql: value,
       id: currentDatabaseItem.key,
       sqlVariables: sqlParams,
     });
+
+    const { code: getColumnCode, data: getColumnData } = await getColumnsBySql({
+      sql: value,
+      databaseId: currentDatabaseItem.key,
+    });
+
     setResultTableLoading(false);
-    if (code === 200) {
-      fetchTaskResult(data);
+    if (code === 200 && getColumnCode === 200) {
+      const columnData = getColumnData.map((item) => {
+        return {
+          ...item,
+          nameEn: item.columnName,
+          type: item.dataType,
+        };
+      });
+      fetchTaskResult(data, columnData);
       setRunState(true);
     } else {
       setRunState(false);
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/data.d.ts b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/data.d.ts
index 14fe0869d..9bd8400b6 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/data.d.ts
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/data.d.ts
@@ -1,7 +1,7 @@
 // 任务查询结果列
 export type TaskResultColumn = {
-  name: string;
-  type: string;
+  columnName: string;
+  dataType: string;
 };
 
 // 任务查询结果
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/models/dimensionData.ts b/webapp/packages/supersonic-fe/src/pages/SemanticModel/models/dimensionData.ts
index b1241deb0..37a44c049 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/models/dimensionData.ts
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/models/dimensionData.ts
@@ -1,7 +1,7 @@
 import { message } from 'antd';
 import { ISemantic } from '../data';
 import { useState } from 'react';
-import { getDimensionList, queryMetric, excuteSql, getDatabaseList } from '../service';
+import { getDimensionList } from '../service';
 
 export default function Dimension() {
   const [dimensionList, setDimensionList] = useState<ISemantic.IDimensionItem[]>([]);
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/models/metricData.ts b/webapp/packages/supersonic-fe/src/pages/SemanticModel/models/metricData.ts
index eeb7e3213..caab8b12e 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/models/metricData.ts
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/models/metricData.ts
@@ -1,7 +1,7 @@
 import { message } from 'antd';
 import { ISemantic } from '../data';
 import { useState } from 'react';
-import { queryMetric, excuteSql, getDatabaseList } from '../service';
+import { queryMetric } from '../service';
 
 export default function Metric() {
   const [metricList, setMetricList] = useState<ISemantic.IMetricItem[]>([]);
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts b/webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts
index 3bd09f354..0352a0b95 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts
@@ -359,26 +359,44 @@ type ExcuteSqlParams = {
 };
 
 // 执行脚本
-export async function excuteSql(params: ExcuteSqlParams) {
+export async function executeSql(params: ExcuteSqlParams) {
   const data = { ...params };
   return request.post(`${process.env.API_BASE_URL}database/executeSql`, { data });
 }
 
+export async function getColumnsBySql(params: { databaseId: number; sql: string }) {
+  return request.get(`${process.env.API_BASE_URL}database/getColumnsBySql`, {
+    params,
+  });
+}
+
 export function getDbNames(dbId: number): Promise<any> {
-  return request(`${process.env.API_BASE_URL}database/getDbNames/${dbId}`, {
+  return request(`${process.env.API_BASE_URL}database/getDbNames`, {
     method: 'GET',
+    params: {
+      id: dbId,
+    },
   });
 }
 
-export function getTables(dbId: number, dbName: string): Promise<any> {
-  return request(`${process.env.API_BASE_URL}database/getTables/${dbId}/${dbName}`, {
+export function getTables(databaseId: number, dbName: string): Promise<any> {
+  return request(`${process.env.API_BASE_URL}database/getTables`, {
     method: 'GET',
+    params: {
+      databaseId,
+      db: dbName,
+    },
   });
 }
 
-export function getColumns(dbId: number, dbName: string, tableName: string): Promise<any> {
-  return request(`${process.env.API_BASE_URL}database/getColumns/${dbId}/${dbName}/${tableName}`, {
+export function getColumns(databaseId: number, dbName: string, tableName: string): Promise<any> {
+  return request(`${process.env.API_BASE_URL}database/getColumnsByName`, {
     method: 'GET',
+    params: {
+      databaseId,
+      db: dbName,
+      table: tableName,
+    },
   });
 }