Merge branch 'dev_v1.5.3_wh1' of jianyu/datatools into feature/v1.5.3

clueSync/jobutil.go

@@ -123,10 +123,10 @@ func WorkDataHandle(company, phone, demand, name, product string, acceptanceData
 					log.Println(positionId, "用户查询失败")
 					return false
 				}
-				if trailstatus == "01" || trailstatus == "03" || trailstatus == "04" {
-					UpdateClue(*uCount, saleData, "", "", uId, "5", "169", "新增线索", "主动咨询客服留资客户", company, name, gconv.String(data["name"]), phone, "", "", "", "", "", "", gconv.String(data["seat_number"]), "", gconv.Int64(data["position_id"]), "", "", "", []string{}, "", isGroup, isCommerce, true, demand)
-				} else {
+				if gconv.Int64(data["position_id"]) == positionId {
 					UpdateClue(*uCount, saleData, "", "", uId, "5", "169", "新增线索", "主动咨询客服留资客户", company, name, gconv.String(data["name"]), phone, "", "", "", "", "", "", gconv.String(data["seat_number"]), "", gconv.Int64(data["position_id"]), "", "", "", []string{}, "", isGroup, isCommerce, false, demand)
+				} else {
+					UpdateClue(*uCount, saleData, "", "", uId, "5", "169", "新增线索", "主动咨询客服留资客户", company, name, gconv.String(data["name"]), phone, "", "", "", "", "", "", gconv.String(data["seat_number"]), "", gconv.Int64(data["position_id"]), "", "", "", []string{}, "", isGroup, isCommerce, true, demand)
 				}
 
 			}
@@ -137,7 +137,7 @@ func WorkDataHandle(company, phone, demand, name, product string, acceptanceData
 		if !ok {
 			return false
 		}
-		SaveClue("", "", uId, "5", "169", "", "", cluename, name, gconv.String(data["name"]), phone, "", "", "", "", "", "", gconv.String(data["seat_number"]), gconv.Int64(data["position_id"]), "", "", "", []string{}, "", isGroup, isCommerce, false, demand)
+		SaveClue("", "", uId, "5", "169", "新增线索", "主动咨询客服留资客户", cluename, name, gconv.String(data["name"]), phone, "", "", "", "", "", "", gconv.String(data["seat_number"]), gconv.Int64(data["position_id"]), "", "", "", []string{}, "", isGroup, isCommerce, false, demand)
 	}
 	//工单生成
 	ok1 := AddOrderWork(acceptanceData, data, product, phone, company)
@@ -420,16 +420,8 @@ FROM
 		return true, administrators3, allData
 	}
 	if deptCount1/deptCount3 > proportion1/proportion3 {
-		positionId1 := gconv.String(administrators3["position_id"])
-		if FindUpperLimit(positionId1, "", false) {
-			return true, administrators1, allData
-		}
 		return true, administrators3, allData
 	} else {
-		positionId1 := gconv.String(administrators1["position_id"])
-		if FindUpperLimit(positionId1, "", false) {
-			return true, administrators3, allData
-		}
 		return true, administrators1, allData
 	}
 	log.Println("电销信息获取失败", positionId)