xuzhiheng 1 rok temu
rodzic
commit
685636e14c
1 zmienionych plików z 2 dodań i 7 usunięć
  1. 2 7
      service/clue.go

+ 2 - 7
service/clue.go

@@ -750,18 +750,13 @@ func ClueImportSync(this *biservice.ClueImportReq) (string, int) {
 						userData := JyBiTidb.FindOne("dwd_f_userbase_contacts", map[string]interface{}{"phone": phone}, "", "")
 						if userData != nil && len(*userData) > 0 {
 							source := common.IntAll((*userData)["source"])
-<<<<<<< HEAD
-							userId := ""
+							userId, belong_to := "", ""
 							uId := common.ObjToString((*userData)["baseinfo_id"])
 							baseData := JyBiTidb.FindOne("dwd_f_userbase_baseinfo", map[string]interface{}{"uid": uId}, "", "")
 							if baseData != nil {
 								userId = common.ObjToString((*baseData)["userid"])
+								belong_to = common.ObjToString((*userData)["belong_to"])
 							}
-=======
-							userId := common.ObjToString((*userData)["userid"])
-							uId := common.ObjToString((*userData)["uid"])
-							belong_to := common.ObjToString((*userData)["belong_to"])
->>>>>>> master
 							if source == 5 {
 								if !isOks {
 									result += ",“该线索已归属域外”"