xuzhiheng 2 years ago
parent
commit
d32728e8c4
2 changed files with 11 additions and 11 deletions
  1. 2 2
      sqlutil/src/sqlmodel/rules_es.go
  2. 9 9
      src/util/utiltag.go

+ 2 - 2
sqlutil/src/sqlmodel/rules_es.go

@@ -143,9 +143,9 @@ type ExistfieldsObjectMust struct {
 // 字段存在 存在放MustNot,字符串为空忽略
 type ExistfieldsObject struct {
 	Filter struct {
-		Missing struct {
+		Exists struct {
 			Field string `json:"field,omitempty"`
-		} `json:"missing,omitempty"`
+		} `json:"exists,omitempty"`
 	} `json:"filter,omitempty"`
 }
 

+ 9 - 9
src/util/utiltag.go

@@ -692,11 +692,11 @@ func Utiltags(tag map[string]interface{}) string {
 			// })
 			ffBoolObject.Must = append(ffBoolObject.Must, sql.ExistfieldsObjectMust{
 				ExistfieldsObject: &sql.ExistfieldsObject{Filter: struct {
-					Missing struct {
+					Exists struct {
 						Field string `json:"field,omitempty"`
-					} `json:"missing,omitempty"`
+					} `json:"exists,omitempty"`
 				}{
-					Missing: struct {
+					Exists: struct {
 						Field string `json:"field,omitempty"`
 					}{Field: v},
 				},
@@ -824,11 +824,11 @@ func Utiltags(tag map[string]interface{}) string {
 			// })
 			fqBoolObject.MustNot = append(fqBoolObject.MustNot, sql.ExistfieldsObjectMust{
 				ExistfieldsObject: &sql.ExistfieldsObject{Filter: struct {
-					Missing struct {
+					Exists struct {
 						Field string `json:"field,omitempty"`
-					} `json:"missing,omitempty"`
+					} `json:"exists,omitempty"`
 				}{
-					Missing: struct {
+					Exists: struct {
 						Field string `json:"field,omitempty"`
 					}{Field: "bidamount"},
 				},
@@ -872,11 +872,11 @@ func Utiltags(tag map[string]interface{}) string {
 			// })
 			fqBoolObject.MustNot = append(fqBoolObject.MustNot, sql.ExistfieldsObjectMust{
 				ExistfieldsObject: &sql.ExistfieldsObject{Filter: struct {
-					Missing struct {
+					Exists struct {
 						Field string `json:"field,omitempty"`
-					} `json:"missing,omitempty"`
+					} `json:"exists,omitempty"`
 				}{
-					Missing: struct {
+					Exists: struct {
 						Field string `json:"field,omitempty"`
 					}{Field: "budget"},
 				},