提交

jyBXCore/rpc/service/operator.go

@@ -465,7 +465,7 @@ func getArea(entid, positionId int64, labelArr *[]map[string]interface{}) map[st
 	}
 	if len(data) > 0 {
 		return map[string]interface{}{
-			"key":        "area",
+			"key":        "province",
 			"type":       "component-popup",
 			"label":      "城市",
 			"defaultVal": []string{},
@@ -484,10 +484,7 @@ type Operator struct {
 	PageNum      int64  //当前页码
 	PageSize     int64  //每页数量
 	Province     string //省份
-	City         string //城市
-	District     string //区县
-	Subtype      string //信息类型-二级
-	TopType      string //信息类型-一级分类
+	TopType      string //信息类型-二级
 	PublishTime  string //发布时间
 	SelectType   string //搜索范围：标题；正文等
 	Price        string //价格
@@ -523,11 +520,9 @@ func SearchList(operator Operator) (int64, *[]map[string]interface{}) {
 	//filter处理
 	if operator.Tag == 1 {
 		mustArr = append(mustArr, `{"match":{"subtype":"采购意向"}}`)
-		operator.Subtype = ""
 		operator.TopType = ""
 	} else if operator.Tag == 2 {
 		mustArr = append(mustArr, `{"exists":{"field":"price"}}`)
-		operator.Subtype = ""
 		operator.TopType = ""
 	}
 	if operator.PublishTime != "" {
@@ -614,7 +609,7 @@ func SearchList(operator Operator) (int64, *[]map[string]interface{}) {
 	if operator.Tagname != "" {
 		keyArr := []string{}
 		for _, v := range strings.Split(operator.Tagname, ",") {
-			keyArr = append(keyArr, fmt.Sprintf(`{"match_phrase":{"tagname":"%s"}`, v))
+			keyArr = append(keyArr, fmt.Sprintf(`{"wildcard":{"tagname":"*%s"}}`, v))
 		}
 		mustArr = append(mustArr, fmt.Sprintf(shouldStr, strings.Join(keyArr, ",")))
 
@@ -623,7 +618,7 @@ func SearchList(operator Operator) (int64, *[]map[string]interface{}) {
 	if operator.Tagname1 != "" {
 		keyArr := []string{}
 		for _, v := range strings.Split(operator.Tagname1, ",") {
-			keyArr = append(keyArr, fmt.Sprintf(`{"match_phrase":{"tagname":"%s"}`, v))
+			keyArr = append(keyArr, fmt.Sprintf(`{"wildcard":{"tagname":"*%s*"}}`, v))
 		}
 		mustArr = append(mustArr, fmt.Sprintf(shouldStr, strings.Join(keyArr, ",")))
 
@@ -632,7 +627,7 @@ func SearchList(operator Operator) (int64, *[]map[string]interface{}) {
 	if operator.Tagname2 != "" {
 		keyArr := []string{}
 		for _, v := range strings.Split(operator.Tagname2, ",") {
-			keyArr = append(keyArr, fmt.Sprintf(`{"match_phrase":{"tagname":"%s"}`, v))
+			keyArr = append(keyArr, fmt.Sprintf(`{"wildcard":{"tagname":"%s"}}`, v))
 		}
 		mustArr = append(mustArr, fmt.Sprintf(shouldStr, strings.Join(keyArr, ",")))
 	}
@@ -721,7 +716,7 @@ func SearchList(operator Operator) (int64, *[]map[string]interface{}) {
 		if len(city) > 0 {
 			query1 := ""
 			query1 += `{"terms":{"city":[`
-			for k, v := range strings.Split(operator.City, ",") {
+			for k, v := range city {
 				if k > 0 {
 					query1 += `,`
 				}
@@ -732,7 +727,7 @@ func SearchList(operator Operator) (int64, *[]map[string]interface{}) {
 		}
 		if len(district) > 0 {
 			query1 := ""
-			for k, v := range strings.Split(operator.District, ",") {
+			for k, v := range district {
 				if k > 0 {
 					query1 += `,`
 				}