Merge branch 'dev_v1.5.19_wh' of jianyu/datatools into feature/v1.5.19

clueSync/everything.go

@@ -381,6 +381,12 @@ func bigCustomer() {
 					userid = common.ObjToString((*userMapping)["userid"])
 					uid = common.ObjToString((*userMapping)["uid"])
 				}
+			} else {
+				userMapping := TiDb.FindOne("dwd_f_userbase_id_mapping", map[string]interface{}{"userid": userid}, "", "")
+				if userMapping != nil && len(*userMapping) > 0 {
+					userid = common.ObjToString((*userMapping)["userid"])
+					uid = common.ObjToString((*userMapping)["uid"])
+				}
 			}
 			if sourceMap[sources] != "" {
 				source := sourceMap[sources]
@@ -389,9 +395,9 @@ func bigCustomer() {
 					continue
 				}
 				key := fmt.Sprintf("%s_%s", source, phone)
-				if _, ok := data[key]; ok {
+				/*if _, ok := data[key]; ok {
 					continue
-				}
+				}*/
 				data[key] = true
 				company := common.ObjToString(v["company"])
 				job := common.ObjToString(v["position"])
@@ -695,6 +701,12 @@ func AdvisoryCommittee() {
 					userid = common.ObjToString((*userMapping)["userid"])
 					uid = common.ObjToString((*userMapping)["uid"])
 				}
+			} else {
+				userMapping := TiDb.FindOne("dwd_f_userbase_id_mapping", map[string]interface{}{"userid": userid}, "", "")
+				if userMapping != nil && len(*userMapping) > 0 {
+					userid = common.ObjToString((*userMapping)["userid"])
+					uid = common.ObjToString((*userMapping)["uid"])
+				}
 			}
 			if sourceMap[sources] != "" {
 				company := common.ObjToString(v["company"])
@@ -861,6 +873,12 @@ func marketCustomer() {
 					userid = common.ObjToString((*userMapping)["userid"])
 					uid = common.ObjToString((*userMapping)["uid"])
 				}
+			} else {
+				userMapping := TiDb.FindOne("dwd_f_userbase_id_mapping", map[string]interface{}{"userid": userid}, "", "")
+				if userMapping != nil && len(*userMapping) > 0 {
+					userid = common.ObjToString((*userMapping)["userid"])
+					uid = common.ObjToString((*userMapping)["uid"])
+				}
 			}
 			if sourceMap[sources] != "" {
 				company := common.ObjToString(v["company"])