Merge branch 'dev_v1.5.36.7_wh' of jianyu/datatools into hotfix/v1.5.36.7

clueSync/everything.go

@@ -815,8 +815,7 @@ func processLead(v map[string]interface{}, sourceMap map[string]map[string]inter
 		return nil, lastTime
 	}
 	// 获取用户信息
-	userData := getUserData(v)
-	if userData == nil || isUserInBlackList(userData) {
+	if getUserData(v) {
 		return nil, lastTime
 	}
 	key := fmt.Sprintf("%s_%s_%s", sources, phone, common.ObjToString(v["interest"]))
@@ -842,7 +841,7 @@ func processLead(v map[string]interface{}, sourceMap map[string]map[string]inter
 }
 
 // 获取用户数据
-func getUserData(v map[string]interface{}) map[string]interface{} {
+func getUserData(v map[string]interface{}) bool {
 	userid := gconv.String(v["userid"])
 	userMapping := &map[string]interface{}{}
 	if !mongodb.IsObjectIdHex(userid) {
@@ -850,11 +849,18 @@ func getUserData(v map[string]interface{}) map[string]interface{} {
 	} else {
 		userMapping = TiDb.FindOne("data_service.user_system", map[string]interface{}{"userid": userid}, "", "")
 	}
-
-	if userMapping != nil && len(*userMapping) > 0 {
-		return *userMapping
+	if userMapping == nil || len(*userMapping) == 0 {
+		return false
 	}
-	return nil
+	uid := gconv.String((*userMapping)["uid"])
+	userData := TiDb.FindOne("dwd_f_userbase_baseinfo", map[string]interface{}{"uid": uid}, "", "")
+	if userData != nil {
+		bt := common.ObjToString((*userData)["belong_to"])
+		if strings.HasPrefix(bt, "03") || bt == "0102" {
+			return true
+		}
+	}
+	return false
 }
 
 // 判断用户是否在黑名单