Merge branch 'dev_v1.5.22_wh' of jianyu/datatools into feature/v1.5.22

clueSync/autoTask.go

@@ -414,6 +414,7 @@ func Thaw() {
 				if TiDb.Update("dwd_f_crm_clue_info", map[string]interface{}{"id": clueId}, map[string]interface{}{
 					"is_assign":   0,
 					"position_id": 0,
+					"seatNumber":  nil,
 				}) {
 					TiDb.Insert("dwd_f_crm_clue_change_record", map[string]interface{}{
 						"clue_id":      clueId,
@@ -606,10 +607,7 @@ func ClueToDxTask() {
 		//log.Println("ent_id", val["ent_id"])
 		clue_id := gconv.Int(val["clue_id"])
 		childIds := []string{}
-		if gconv.String(val["ent_id"]) == "" {
-			continue
-		}
-		if gconv.Int(val["ent_id"]) == 0 {
+		if gconv.String(val["ent_id"]) == "" || gconv.Int(val["ent_id"]) == 0 {
 			continue
 		}
 		if mongodb.IsObjectIdHex(gconv.String(val["ent_id"])) { //mongodb  个人身份大会员
@@ -622,7 +620,6 @@ func ClueToDxTask() {
 					childIds = append(childIds, mongodb.BsonIdToSId(v["_id"]))
 				}
 			}
-
 		} else { //企业大会员
 			//根据企业id查询企业下的员工
 			data := TiDb.Query("SELECT userid,uid FROM dwd_f_userbase_id_mapping WHERE ent_id = ?", gconv.Int(val["ent_id"]))