Merge branch 'hotfix_1.10_4.0.x_34801' into 1.10_release_4.0.x

Author: gituser

core/src/main/java/com/dtstack/flink/sql/util/TableUtils.java

@@ -539,11 +539,25 @@ private static void replaceConditionNode(SqlNode selectNode, String oldTbName, S
 
             String tableName = sqlIdentifier.names.asList().get(0);
             String tableField = sqlIdentifier.names.asList().get(1);
-            String fieldKey = tableName + "_" + tableField;
+            String fieldKey = tableName + "." + tableField;
 
             if(tableName.equalsIgnoreCase(oldTbName)){
 
-                String newFieldName = fieldReplaceRef.get(fieldKey) == null ? tableField : fieldReplaceRef.get(fieldKey);
+                /*
+                 *  ****Before replace:*****
+                 *  fieldKey: b.department
+                 *  fieldReplaceRef : b.department -> a_b_0.department0
+                 *  oldFieldRef: a_b_0.department0
+                 *  oldTbName: b
+                 *  oldFieldName: department
+                 *  ****After replace:*****
+                 *  newTbName: a_b_0
+                 *  newFieldName: department0
+                 */
+                String oldFieldRef = fieldReplaceRef.get(fieldKey);
+                String newFieldName = (oldFieldRef != null && !StringUtils.substringAfter(oldFieldRef, ".").isEmpty()) ?
+                        StringUtils.substringAfter(oldFieldRef, ".") : tableField;
+
                 SqlIdentifier newField = ((SqlIdentifier)selectNode).setName(0, newTbName);
                 newField = newField.setName(1, newFieldName);
                 ((SqlIdentifier)selectNode).assignNamesFrom(newField);