Merge branch 'dev_v1.1.40_wh' of BaseService/jyMicroservices into feature/v1.1.40

jyBXSubscribe/rpc/model/push.go

@@ -1209,7 +1209,7 @@ func (s *subscribePush) getDefaultDatasSQL(bsp *ViewCondition) (str string) {
 	query_bool_should := `{"bool":{"should":[%s],"minimum_should_match": 1}}`
 	multi_match := `{"multi_match": {"query": %s,"type": "phrase", "fields": [%s]}}`
 	query_bool_must_and := `{"bool":{"must":[%s]%s}}`
-	query_bool_must_and_district := `{"bool":{"must":[{"terms":{"area":["%s"]}},{"terms":{"district":["%s"]}}]}}`
+	query_bool_must_and_district := `{"bool":{"must":[{"terms":{"city":["%s"]}},{"terms":{"district":["%s"]}}]}}`
 
 	bools := []string{}
 	musts := []string{}