Merge remote-tracking branch 'origin/master'

src/main/scala/com/winhc/bigdata/spark/utils/CompanyIncrForCidWithoutMD5Utils.scala

@@ -96,7 +96,7 @@ case class CompanyIncrForCidWithoutMD5Utils(s: SparkSession,
          |        ,cid
          |        ,${columns.mkString(",")}
          |FROM    (
-         |            SELECT  CONCAT_WS('_',new_cid,${cols_md5.mkString(",")}) AS rowkey
+         |            SELECT  CONCAT_WS('_',new_cid,${cols_md5.mkString("cleanup(","), cleanup(",")")}) AS rowkey
          |                    ,flag
          |                    ,new_cid
          |                    ,cid
@@ -145,7 +145,7 @@ case class CompanyIncrForCidWithoutMD5Utils(s: SparkSession,
       inc_ads_company_tb,
       tableName,
       lastDsIncOds,
-      s"CONCAT_WS('_',new_cid,${cols_md5.mkString(",")})"
+      s"CONCAT_WS('_',new_cid,${cols_md5.mkString("cleanup(","), cleanup(",")")})"
     ).syn()
 
     CompanyIncSummary(spark, project, tableName, "new_cid", dupliCols).calc