sensitive

src/jy/extract/extractudp.go

@@ -155,15 +155,8 @@ func ExtractByUdp(sid, eid string, instanceId ...string) {
 			if ext.TaskInfo.FDB.Count(ext.TaskInfo.FromColl+"_back", queryback) > 0 {
 				list2, _ := ext.TaskInfo.FDB.Find(ext.TaskInfo.FromColl+"_back", queryback, nil, Fields, false, 0, limit)
 				for _, v := range *list2 {
-<<<<<<< HEAD
-					if v["sensitive"] != nil { //去除含敏感词数据
-						if v["sensitive"].(string) != "" {
-							continue
-						}
-=======
-					if qu.ObjToString(v["check_sensitive2"]) != "" { //去除含敏感词数据
+					if qu.ObjToString(v["sensitive"]) != "" { //去除含敏感词数据
 						continue
->>>>>>> 60d47d50992bea38b0f4c3b40204314bac6a4985
 					}
 					//log.Println(v["_id"])
 					j := PreInfo(v)