Merge branch 'master' into v0.0.1

common/src/qfw/util/dataexport/common.go

@@ -4,7 +4,6 @@ import (
 	qutil "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/mysql"
 	"fmt"
-	"log"
 	"strings"
 )
 
@@ -46,17 +45,13 @@ func GetDataExportMatchKey(scd *SieveCondition, list *[]map[string]interface{})
 		return
 	}
 	if scd.Comeinfrom == "pushHistory" { //历史推送数据使用推送匹配关键词 if len(scd.PushKeyWords) == len(*list) {
-		if len(scd.SelectIds) == len(scd.PushKeyWords) {
-			for _, v := range *list {
-				for k, v1 := range scd.SelectIds {
-					if v1 == qutil.InterfaceToStr(v["_id"]) {
-						v["keyword"] = scd.PushKeyWords[k]
-					}
+		for _, v := range *list {
+			for k, v1 := range scd.SelectIds {
+				if v1 == qutil.InterfaceToStr(v["_id"]) {
+					v["keyword"] = scd.PushKeyWords[k]
 				}
-				//v["keyword"] = scd.PushKeyWords[qutil.InterfaceToStr(v["_id"])]
 			}
-		} else {
-			log.Println("历史推送数据订阅词匹配失败++++", len(scd.SelectIds), len(scd.PushKeyWords), scd.Id)
+			//v["keyword"] = scd.PushKeyWords[qutil.InterfaceToStr(v["_id"])]
 		}
 	} else if len(scd.Keyword) > 0 { //关键词二次匹配
 		types := scd.SelectType
@@ -71,7 +66,9 @@ func GetDataExportMatchKey(scd *SieveCondition, list *[]map[string]interface{})
 			}
 			if len(vk.Appended) > 0 {
 				for _, v := range vk.Appended {
-					key = append(key, strings.Split(v, " ")...)
+					if v != "" {
+						key = append(key, strings.Split(v, " ")...)
+					}
 				}
 			}
 			vk.Keyword = strings.Join(key, ",")