diff --git a/backend/apps/db/db_sql.py b/backend/apps/db/db_sql.py
index 8f0710fa2..566fbeb03 100644
--- a/backend/apps/db/db_sql.py
+++ b/backend/apps/db/db_sql.py
@@ -271,11 +271,10 @@ def get_field_sql(ds: CoreDatasource, conf: DatasourceConf, table_name: str = No
                     c.DATA_TYPE      AS "DATA_TYPE",
                     COALESCE(com.COMMENTS, '') AS "COMMENTS"
                 FROM 
-                    ALL_TAB_COLS c
+                    ALL_TAB_COLUMNS c
                 LEFT JOIN 
                     ALL_COL_COMMENTS com 
-                    ON c.OWNER = com.OWNER 
-                   AND c.TABLE_NAME = com.TABLE_NAME 
+                    ON c.TABLE_NAME = com.TABLE_NAME 
                    AND c.COLUMN_NAME = com.COLUMN_NAME
                 WHERE 
                     c.OWNER = :param1
diff --git a/frontend/src/views/chat/chat-block/ChartBlock.vue b/frontend/src/views/chat/chat-block/ChartBlock.vue
index 93e525b66..5b9300e4f 100644
--- a/frontend/src/views/chat/chat-block/ChartBlock.vue
+++ b/frontend/src/views/chat/chat-block/ChartBlock.vue
@@ -219,6 +219,8 @@ const showLabel = ref(false)
 function addToDashboard() {
   const recordeInfo = {
     id: '1-1',
+    sourceRecordId: props.message?.record.id,
+    sourceChatId: props.message?.record.chat_id,
     data: {
       data: data.value,
     },