diff --git a/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml b/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml
index a532fb0fd0..d7ab36aeab 100644
--- a/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml
@@ -645,7 +645,7 @@
                                       last_sync_time)
         SELECT uuid()                                 AS id,
                chart_view_field.table_id,
-               chart_view_field.pv_copy.chart_view_id AS chart_id,
+               pv_copy.chart_view_id AS chart_id,
                chart_view_field.origin_name,
                chart_view_field.`name`,
                chart_view_field.dataease_name,
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 1086995a1a..1af4e7036a 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -879,10 +879,11 @@ public class ChartViewService {
                 fieldsToFilter.addAll(xAxisBase);
             }
             ChartDrillRequest head = drillRequestList.get(0);
-            Map<String, String> dimValMap = head.getDimensionList().stream().collect(Collectors.toMap(ChartDimensionDTO::getId, ChartDimensionDTO::getValue, ((p, n) -> p)));
-            Map<String, ChartViewFieldDTO> fieldMap = Stream.of(xAxisBase, xAxisExt, extStack).
-                    flatMap(Collection::stream).
-                    collect(Collectors.toMap(ChartViewFieldDTO::getId, o -> o, ((p, n) -> p)));
+            Map<String, String> dimValMap = new HashMap<>();
+            head.getDimensionList().forEach(item -> dimValMap.put(item.getId(), item.getValue()));
+            Map<String, ChartViewFieldDTO> fieldMap = Stream.of(xAxisBase, xAxisExt, extStack)
+                    .flatMap(Collection::stream)
+                    .collect(Collectors.toMap(ChartViewFieldDTO::getId, o -> o, ((p, n) -> p)));
             for (int i = 0; i < drillRequestList.size(); i++) {
                 ChartDrillRequest request = drillRequestList.get(i);
                 ChartViewFieldDTO chartViewFieldDTO = drill.get(i);
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 2614f8da26..750cc3f096 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -1168,8 +1168,12 @@ public class DataSetTableService {
             binaryExpression = (BinaryExpression) expr;
         } catch (Exception e) {
         }
-        if (binaryExpression != null && !(binaryExpression.getLeftExpression() instanceof BinaryExpression) && !(binaryExpression.getRightExpression() instanceof BinaryExpression) && hasVariable(binaryExpression.toString())) {
-            stringBuilder.append(SubstitutedSql);
+        if (binaryExpression != null) {
+            if (!(binaryExpression.getLeftExpression() instanceof BinaryExpression) && !(binaryExpression.getLeftExpression() instanceof InExpression) && hasVariable(binaryExpression.getRightExpression().toString())) {
+                stringBuilder.append(SubstitutedSql);
+            }else {
+                expr.accept(getExpressionDeParser(stringBuilder));
+            }
         } else {
             expr.accept(getExpressionDeParser(stringBuilder));
         }
diff --git a/frontend/src/components/elVisualSelect/index.vue b/frontend/src/components/elVisualSelect/index.vue
index d05209996f..4f1091c296 100644
--- a/frontend/src/components/elVisualSelect/index.vue
+++ b/frontend/src/components/elVisualSelect/index.vue
@@ -270,7 +270,5 @@ export default {
 .select-all {
   padding: 10px 20px 0 20px;
 }
-.coustom-de-select {
-  z-index: 999 !important;
-}
+
 </style>
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index 3bdb286885..f3299c3907 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -463,14 +463,6 @@
               >
                 <template #header>
                   {{ $t('commons.params_value') }}
-                  <el-tooltip
-                    class="item"
-                    effect="dark"
-                    :content="$t('commons.parameter_effect')"
-                    placement="top"
-                  >
-                    <svg-icon icon-class="icon_info_filled" />
-                  </el-tooltip>
                 </template>
                 <template slot-scope="scope">
                   <el-input
diff --git a/frontend/src/views/panel/filter/FilterDialog.vue b/frontend/src/views/panel/filter/FilterDialog.vue
index 41b685f2bc..fe04b0923d 100644
--- a/frontend/src/views/panel/filter/FilterDialog.vue
+++ b/frontend/src/views/panel/filter/FilterDialog.vue
@@ -567,6 +567,7 @@ export default {
         const data = res.data
 
         this.viewInfos = data
+        this.updateParentName()
         this.childViews.viewInfos = data
       })
       var type = 'TEXT'
@@ -582,6 +583,17 @@ export default {
         this.childViews.datasetParams = data
       })
     },
+    updateParentName() {
+      if (this.fieldsParent && this.viewInfos?.length && this.activeName !== 'dataset') {
+        this.viewInfos.forEach(info => {
+          if (info.id === this.fieldsParent.id && info.name !== this.fieldsParent.name) {
+            this.fieldsParent.name = info.name
+            this.comBackLink(this.fieldsParent)
+            this.comShowFieldData(this.fieldsParent)
+          }
+        })
+      }
+    },
     handleNodeClick(data) {
       if (data.modelInnerType !== 'group') {
         this.showFieldData(data)