|
@@ -404,6 +404,14 @@ func Utiltags(tag map[string]interface{}) string {
|
|
|
"bool": torules,
|
|
|
})
|
|
|
}
|
|
|
+ }else if len(torules.Should) > 0 {
|
|
|
+ if QueryObjecct.Filtered.Query == nil{
|
|
|
+ QueryObjecct.Filtered.Query = &models.Query{}
|
|
|
+ QueryObjecct.Filtered.Query.Bool = &fqBoolObject
|
|
|
+ }
|
|
|
+ QueryObjecct.Filtered.Query.Bool.Must = append(QueryObjecct.Filtered.Query.Bool.Must, map[string]interface{}{
|
|
|
+ "bool": torules,
|
|
|
+ })
|
|
|
}
|
|
|
rdata := make(map[string]interface{})
|
|
|
rdata["query"] = QueryObjecct
|