|
@@ -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
|
|
|
| SELECT *
|
|
|
| FROM $inc_ods_tab
|
|
|
| WHERE ds > 0
|
|
|
+ | AND company_id is not null
|
|
|
+ | AND trim(company_id) <> ''
|
|
|
+ | AND name is not null
|
|
|
+ | AND trim(name) <> ''
|
|
|
| ) AS t1
|
|
|
| ) AS t2
|
|
|
|WHERE t2.num = 1
|
|
@@ -123,6 +131,7 @@ case class inc_company_ng(s: SparkSession,
|
|
|
| FROM $inc_ods_tab
|
|
|
| WHERE ds > $org_ds
|
|
|
| AND company_id is not null
|
|
|
+ | AND trim(company_id) <> ''
|
|
|
| AND name is not null
|
|
|
| AND trim(name) <> ''
|
|
|
| ) AS t1
|