fix

src/main/scala/com/winhc/bigdata/spark/jobs/GraphX4Judicase.scala

@@ -30,7 +30,7 @@ case class GraphX4Judicase(s: SparkSession,
       s"""
          |SELECT  id, case_no, tn
          |FROM    $project.dwd_judicial_case
-         |WHERE   ${twoPart.map(m=>{s"ds = '${m._1}' AND tn = '${m._2}'"}).mkString("(", ") OR (", ")")}
+         |WHERE   ${twoPart.map(m=>{s"ds = '${m._2}' AND tn = '${m._1}'"}).mkString("(", ") OR (", ")")}
          |""".stripMargin)
       .withColumn("id_Long",monotonically_increasing_id)
       .createOrReplaceTempView("tmp_graphx_dwd_judicial_case")
@@ -48,7 +48,7 @@ case class GraphX4Judicase(s: SparkSession,
          |) AB
          |LEFT JOIN tmp_graphx_dwd_judicial_case C
          |ON AB.id_2=C.id
-         |WHERE num=1
+         |WHERE num=1 AND id_1 IS NOT NULL AND C.id_Long IS NOT NULL
          |""".stripMargin)
     val edgeRDD: RDD[Edge[Long]] = dfRelations .select(dfRelations.columns.map(column => col(column).cast("string")): _*) .rdd.map(r => {
       val case_no_from = r.getAs[String](fromCol)

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

@@ -98,7 +98,7 @@ object BaseUtil {
       }
       r1
     }).groupBy(_._1)
-      .map(m => (m._2.maxBy(n => n._2)._2, m._1))
+      .map(m => (m._1, m._2.maxBy(n => n._2)._2))
       .filter(_._2 != "")
     ps.toArray
   }