默认值处理

jyBXCore/rpc/service/operator.go

@@ -698,7 +698,7 @@ func SearchList(operator Operator) (int64, *[]map[string]interface{}, int64) {
 			for k1, v1 := range gconv.Map(v) {
 				city = append(city, k1)
 				for _, v3 := range gconv.SliceStr(v1) {
-					district = append(district, fmt.Sprintf("%s_%s", k1, v3))
+					district = append(district, v3)
 				}
 			}
 		}
@@ -729,15 +729,14 @@ func SearchList(operator Operator) (int64, *[]map[string]interface{}, int64) {
 		}
 		if len(district) > 0 {
 			query1 := ""
+			query1 += `{"terms":{"district":[`
 			for k, v := range district {
 				if k > 0 {
 					query1 += `,`
 				}
-				cityName := strings.Split(v, "_")[0]
-				districtName := strings.Split(v, "_")[1]
-				queryBoolMustAndDistrict := `{"bool":{"must":[{"terms":{"city":["%s"]}},{"terms":{"district":["%s"]}}]}}`
-				query1 += fmt.Sprintf(queryBoolMustAndDistrict, cityName, districtName)
+				query1 += `"` + v + `"`
 			}
+			query1 += `]}}`
 			filterArr = append(filterArr, query1)
 		}
 	}