diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index d46f29d589..e58d75f313 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -324,6 +324,7 @@ const typeList = [
 const handleCheckAllChange = (val: boolean) => {
   curComponent.value.checkedFields = val ? fields.value.map(ele => ele.componentId) : []
   isIndeterminate.value = false
+  val && setSameId()
 }
 
 const setTreeDefault = () => {
@@ -375,12 +376,41 @@ const handleCheckedFieldsChange = (value: string[]) => {
   if (curComponent.value.displayType === '8') return
   setType()
 }
+const setSameId = () => {
+  const comIdMap = {}
+  Object.keys(curComponent.value.checkedFieldsMap).forEach(ele => {
+    if (curComponent.value.checkedFieldsMap[ele]) {
+      fields.value.forEach(itx => {
+        if (
+          itx.componentId === ele &&
+          curComponent.value.checkedFields?.includes(itx.componentId)
+        ) {
+          comIdMap[itx.id] = curComponent.value.checkedFieldsMap[itx.componentId]
+        }
+      })
+    }
+  })
 
+  Object.keys(curComponent.value.checkedFieldsMap).forEach(ele => {
+    if (!curComponent.value.checkedFieldsMap[ele]) {
+      fields.value.forEach(itx => {
+        if (
+          itx.componentId === ele &&
+          curComponent.value.checkedFields?.includes(itx.componentId) &&
+          comIdMap[itx.id]
+        ) {
+          curComponent.value.checkedFieldsMap[itx.componentId] = comIdMap[itx.id]
+        }
+      })
+    }
+  })
+}
 const handleCheckedFieldsChangeTree = (value: string[]) => {
   handleDialogClick()
   const checkedCount = value.length
   checkAll.value = checkedCount === fields.value.length
   isIndeterminate.value = checkedCount > 0 && checkedCount < fields.value.length
+  setSameId()
   if (curComponent.value.displayType === '8') return
   if (curComponent.value.displayType === '9') {
     setTreeDefault()
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
index d105b48ff6..8fa06295b0 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
@@ -364,6 +364,11 @@ const dsChange = (val: string) => {
     })
 }
 
+const handleDsChange = () => {
+  setFlag()
+  dsChange()
+}
+
 const copyInfo = async (value: string) => {
   try {
     await toClipboard(value)
@@ -488,7 +493,7 @@ const mousedownDrag = () => {
         </p>
         <el-tree-select
           :check-strictly="false"
-          @change="dsChange"
+          @change="handleDsChange"
           :placeholder="t('dataset.pls_slc_data_source')"
           class="ds-list"
           popper-class="tree-select-ds_popper"