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

clueSync/jobutil.go

@@ -561,12 +561,12 @@ func FindUpperLimit(positionId string, dataType string) bool {
 
 	if dataType == "positionId" {
 		fmt.Println("111", positionId, TiDb.CountBySql(`select count(1) from dwd_f_crm_clue_info where position_id=? and is_assign=1    `, positionId))
-		//return TiDb.CountBySql(`select count(1) from dwd_f_crm_clue_info where position_id=? and is_assign=1   and trailstatus != '08'  `, positionId) >= cfg.AllocationCap
-		return TiDb.CountBySql(`select count(1) from dwd_f_crm_clue_info where position_id=? and is_assign=1   `, positionId) >= cfg.AllocationCap
+		return TiDb.CountBySql(`select count(1) from dwd_f_crm_clue_info where position_id=? and is_assign=1   and trailstatus != '08'  `, positionId) >= cfg.AllocationCap
+		//return TiDb.CountBySql(`select count(1) from dwd_f_crm_clue_info where position_id=? and is_assign=1   `, positionId) >= cfg.AllocationCap
 	} else {
 		fmt.Println("222", positionId, TiDb.CountBySql(`select count(1) from dwd_f_crm_clue_info where seatNumber=? and  is_assign `, positionId))
-		//return TiDb.CountBySql(`select count(1) from dwd_f_crm_clue_info where seatNumber=? and  is_assign and trailstatus != '08' `, positionId) >= cfg.AllocationCap
-		return TiDb.CountBySql(`select count(1) from dwd_f_crm_clue_info where seatNumber=? and  is_assign  `, positionId) >= cfg.AllocationCap
+		return TiDb.CountBySql(`select count(1) from dwd_f_crm_clue_info where seatNumber=? and  is_assign and trailstatus != '08' `, positionId) >= cfg.AllocationCap
+		//return TiDb.CountBySql(`select count(1) from dwd_f_crm_clue_info where seatNumber=? and  is_assign  `, positionId) >= cfg.AllocationCap
 
 	}
 }