fix: 企业动态过滤变更时间为空

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/CompanyDynamic.scala

@@ -30,7 +30,7 @@ object CompanyDynamic {
                                 project: String, //表所在工程名
                                 ds: String //此维度主键
 
-                               ) extends LoggingUtils with Logging with BaseFunc{
+                               ) extends LoggingUtils with Logging with BaseFunc {
     @(transient@getter) val spark: SparkSession = s
 
 
@@ -141,12 +141,14 @@ object CompanyDynamic {
         val biz_date = r.getAs[String]("biz_date")
         val fields = r.getAs[String]("fields")
         val cname = r.getAs[String]("cname")
+        if (biz_date == null)
+          None
         val result = handle.handle(rowkey, biz_date, cid, if (fields == null) null else fields.split(","), old_data, new_data, cname)
         if (result == null) {
           None
         }
         else {
-          result.map(res => Row(CompanyDynamicHandleUtils.getDynamicId(res._1, res._4, res._7, res._6), res._1, res._2, res._3, res._4, res._5, res._6, res._7, res._8, res._9, res._10, DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")))
+          result.map(res => Row(CompanyDynamicHandleUtils.getDynamicId(res._1, res._4, res._7, res._6), res._1, res._2, res._3, res._4.replaceAll("null", ""), res._5, res._6, res._7, res._8, res._9, res._10, DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")))
         }
       })
 
@@ -167,7 +169,7 @@ object CompanyDynamic {
       spark.createDataFrame(rdd, schema)
         .createOrReplaceTempView(s"company_dynamic_tmp$tableName")
 
-//      val cols = getColumns(s"$project.$targetTab").filter(!_.equals("ds")).filter(!_.equals("tn"))
+      //      val cols = getColumns(s"$project.$targetTab").filter(!_.equals("ds")).filter(!_.equals("tn"))
       unescapeHtml4()
       sql(
         s"""