Merge branch 'dev_v1.0.24.2_wh' of BaseService/biService into hotfix/v1.0.24.2

service/clue.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"encoding/json"
 	"fmt"
+	"github.com/gogf/gf/v2/util/gconv"
 	"io/ioutil"
 	"math"
 	"net/http"
@@ -809,11 +810,12 @@ func ClueImportSync(this *biservice.ClueImportReq) (string, int) {
 					companyName = phone
 				}
 				isOK, isOks, dataMap := false, true, map[string]interface{}{
-					"cluename":   companyName,
-					"name":       name,
-					"phone":      phone,
-					"position":   position,
-					"clueSource": clueSource,
+					"cluename":    companyName,
+					"companyName": companyName,
+					"name":        name,
+					"phone":       phone,
+					"position":    position,
+					"clueSource":  clueSource,
 				}
 				if phone == "" {
 					isOks = false
@@ -971,6 +973,16 @@ func ClueImportSync(this *biservice.ClueImportReq) (string, int) {
 							})
 						}
 					} else {
+						isUpdate := gconv.Int64((*clueData)["is_artificially_modified"])
+						if isUpdate == 1 {
+							cluename = ""
+						} else {
+							if gconv.String(v["companyName"]) != "" {
+								cluename = gconv.String(v["companyName"])
+							} else {
+								cluename = ""
+							}
+						}
 						is_assign := common.IntAll((*clueData)["is_assign"])
 						clueId := common.Int64All((*clueData)["id"])
 						batch_import := common.ObjToString((*clueData)["batch_import"])