Browse Source

fix: rowkey生成可不依赖company_id

许家凯 3 years ago
parent
commit
5d145a2b2d

+ 5 - 1
src/main/scala/com/winhc/bigdata/spark/ng/jobs/general_handler.scala

@@ -97,7 +97,11 @@ case class general_handler(s: SparkSession,
       if (md5_fields.isEmpty) {
         s"company_id"
       } else {
-        s"concat_ws('_',company_id,md5(cleanup(concat_ws('',${md5_fields.mkString(",")}))))"
+        if (md5_fields.contains("company_id") && job_args.verify_company_id) {
+          s"concat_ws('_',company_id,md5(cleanup(concat_ws('',${md5_fields.mkString(",")}))))"
+        } else {
+          s"md5(cleanup(concat_ws('',${md5_fields.mkString(",")})))"
+        }
       }
     }