Merge branch 'hotfix_3.9.x_25656' into hotfix_3.9.x_jingdongfang

kanata163 · kanata163 · commit 59f4a32f9fc6 · 2020-05-09T11:17:05.000+08:00
diff --git a/flinkx-rdb/flinkx-rdb-reader/src/main/java/com.dtstack.flinkx.rdb.datareader/QuerySqlBuilder.java b/flinkx-rdb/flinkx-rdb-reader/src/main/java/com.dtstack.flinkx.rdb.datareader/QuerySqlBuilder.java
@@ -159,6 +159,13 @@ private String buildQuerySqlWithCustomSql(){
             querySql.append(" ").append(RESTORE_FILTER_PLACEHOLDER);
         }
 
+        if (customFilter != null){
+            customFilter = customFilter.trim();
+            if (customFilter.length() > 0){
+                querySql.append(" AND ").append(customFilter);
+            }
+        }
+
         return querySql.toString();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,13 @@ private String buildQuerySqlWithCustomSql(){`
`159`	`159`	`querySql.append(" ").append(RESTORE_FILTER_PLACEHOLDER);`
`160`	`160`	`}`
`161`	`161`
	`162`	`+ if (customFilter != null){`
	`163`	`+ customFilter = customFilter.trim();`
	`164`	`+ if (customFilter.length() > 0){`
	`165`	`+ querySql.append(" AND ").append(customFilter);`
	`166`	`+ }`
	`167`	`+ }`
	`168`	`+`
`162`	`169`	`return querySql.toString();`
`163`	`170`	`}`
`164`	`171`