@@ -53,6 +53,7 @@ case class general_handler(s: SparkSession,
s"""
|company_id <> '0'
|AND company_id is not null
+ |AND trim(company_id) <> ''
|AND ${md5_fields.map(" " + _ + " is not null ").mkString("AND")}
|AND trim(concat_ws('',${md5_fields.mkString(",")})) <> ''
|""".stripMargin
@@ -57,10 +57,18 @@ case class inc_company_ng(s: SparkSession,
| SELECT *
| FROM $ods_tab
| WHERE ds > 0
+ | AND company_id is not null
+ | AND trim(company_id) <> ''
+ | AND name is not null
+ | AND trim(name) <> ''
| UNION ALL
| FROM $inc_ods_tab
| ) AS t1
| ) AS t2
|WHERE t2.num = 1
@@ -123,6 +131,7 @@ case class inc_company_ng(s: SparkSession,
| WHERE ds > $org_ds
| AND company_id is not null
| AND name is not null
| AND trim(name) <> ''