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

jyBXCore/rpc/entity/search.go

@@ -242,6 +242,7 @@ func (kws *KeyWordsSearch) SearchParamsHandle(in *bxcore.SearchReq) []string {
 		in.WinnerTel = ""
 		in.ExclusionWords = ""
 		in.City = ""
+		in.District = ""
 		in.ExclusionWords = ""
 	}
 	//判断是否有关键词

jyBXCore/rpc/model/es/search.go

@@ -238,6 +238,18 @@ func GetBidSearchQuery(in *bxcore.SearchReq) string {
 	}
 	district := in.District
 	if district != "" {
+		for k, v := range strings.Split(district, ",") {
+			if k > 0 {
+				query += `,`
+			}
+			cityName := strings.Split(v, "_")[0]
+			districtName := strings.Split(v, "_")[1]
+			query_bool_must_and_district := `{"bool":{"must":[{"terms":{"city":["%s"]}},{"terms":{"district":["%s"]}}]}}`
+			query += fmt.Sprintf(query_bool_must_and_district, cityName, districtName)
+		}
+
+	}
+	/*if district != "" {
 		for _, v := range strings.Split(district, ",") {
 			if len(v) > 0 {
 				query += ","
@@ -256,7 +268,7 @@ func GetBidSearchQuery(in *bxcore.SearchReq) string {
 			query += `]}}`
 		}
 
-	}
+	}*/
 	if query != "" {
 		query = fmt.Sprintf(queryBoolShould, query)
 	}