Merge branch 'dev3.4' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.4

udpcreateindex/src/biddingall.go

@@ -245,6 +245,10 @@ func biddingAllTask(data []byte, mapInfo map[string]interface{}) {
 			if district, ok := tmp["district"].(string); ok && district == "" { //city为空
 				delete(tmp, "district")
 			}
+			//栏目channel
+			if channel, ok := tmp["channel"].(string); ok && channel == "" { //channel为空
+				delete(tmp, "channel")
+			}
 			//预算和中标金额
 			//			if s_budget := fmt.Sprint(tmp["budget"]); s_budget == "" || s_budget == "<nil>" || s_budget == "null" {
 			//				tmp["budget"] = nil

udpcreateindex/src/biddingindex.go

@@ -287,6 +287,10 @@ func doIndex(infos []map[string]interface{}, eMap map[string]map[string]interfac
 		if district, ok := tmp["district"].(string); ok && district == "" { //city为空
 			delete(tmp, "district")
 		}
+		//栏目channel
+		if channel, ok := tmp["channel"].(string); ok && channel == "" { //channel为空
+			delete(tmp, "channel")
+		}
 		UpdatesLock.Lock()
 		//		for k1, _ := range tmp {
 		//			if strings.HasSuffix(k1, "_b") || k1 == "contenthtml" {