bug fix

eda/feededa/src/main/scala/com/gmei/Data2FFM.scala

@@ -72,6 +72,9 @@ object Data2FFM {
       val esmm_pre_cids = esmm_pre_data.select("cid_id").distinct().collect().map(
         s => s(0).toString
       )
+      val esmm_pre_city = esmm_pre_data.select("ucity_id").distinct().collect().map(
+        s => s(0).toString
+      )
 
 
 
@@ -97,6 +100,7 @@ object Data2FFM {
       }
 
       val esmm_join_cids = esmm_pre_cids.intersect(column_number("cid_id"))
+      val esmm_join_city = esmm_pre_city.intersect(column_number("ucity_id"))
 
 
 
@@ -139,6 +143,7 @@ object Data2FFM {
         .map(x => (x(0).toString,x(1).toString,x(2).toString,x(3).toString,
           x(4).toString,x(5).toString,x(6).toString,
           x(7).toString,x(8).toString,x(9).toString,x(10).toString)).filter(x => esmm_join_cids.indexOf(x._6) != -1)
+        .filter(x => esmm_join_city.indexOf(x._5) != -1)
       rdd_pre.persist()
       val pre = rdd_pre.map(x => (x._1,x._2,x._3,
         column_number("stat_date").indexOf(x._4), column_number("ucity_id").indexOf(x._5),