xiugai

clueSync/job.go

@@ -572,7 +572,7 @@ func UpdateClue(data map[string]interface{}, saleData []map[string]interface{},
 			}
 		}
 	}
-	if trailstatus == "00" || old_position_id == 0 || is_assign != 1 || (pIsOk && old_cluename != cluename) {
+	if trailstatus == "00" || old_position_id == 0 || is_assign != 1 || (pIsOk && old_cluename != cluename && cluename != "") {
 		if trailstatus == "00" && trailstatusTime != "" && time.Now().Unix()-trailstatusTimes.Unix() < 86400 {
 		} else {
 			clueUpdateData["seatNumber"] = seatNumber
@@ -653,7 +653,7 @@ func UpdateClue(data map[string]interface{}, saleData []map[string]interface{},
 		//线索
 		ok = TiDb.UpdateByTx(tx, "dwd_f_crm_clue_info", map[string]interface{}{"uid": uId}, clueUpdateData)
 		//变更记录
-		if (trailstatus == "00" || old_position_id == 0 || (pIsOk && old_cluename != cluename)) && is_assign == 1 {
+		if (trailstatus == "00" || old_position_id == 0 || (pIsOk && old_cluename != cluename && cluename != "")) && is_assign == 1 {
 			if trailstatus == "00" && trailstatusTime != "" && time.Now().Unix()-trailstatusTimes.Unix() < 86400 {
 			} else if old_position_id == 0 {
 				updateId1 = TiDb.InsertByTx(tx, "dwd_f_crm_clue_change_record", map[string]interface{}{
@@ -679,7 +679,7 @@ func UpdateClue(data map[string]interface{}, saleData []map[string]interface{},
 					"operator_id":  -1,
 				})
 			} else {
-				if pIsOk && old_cluename != cluename {
+				if pIsOk && old_cluename != cluename && cluename != "" {
 					updateId1 = TiDb.InsertByTx(tx, "dwd_f_crm_clue_change_record", map[string]interface{}{
 						"clue_id":      clueId,
 						"position_id":  positionId,

clueSync/jobutil.go

@@ -237,7 +237,7 @@ func getClueType(item string, data map[string]interface{}, sourceCode string) (p
 // 获取自动分配的人
 func autoDraw(mode, cluename string, isGroup, isCommerce int) (positionId int64, seatNumber, saleName string, saleData []map[string]interface{}, isOk bool) {
 	isOk = false
-	if isGroup == 0 && isCommerce == 1 {
+	if isGroup == 0 && isCommerce == 1 && cluename != "" {
 		cdata := TiDb.FindOne("dwd_f_crm_clue_info", map[string]interface{}{"cluename": cluename, "is_assign": 1}, "", "")
 		if cdata != nil && len(*cdata) > 0 {
 			isOk = true