Merge branch 'dev/v4.9.17_dx' of qmx/jy into feature/v4.9.17

src/jfw/front/searchOptimize.go

@@ -100,11 +100,11 @@ type SearchOptimize struct {
 	Buyer               string        `json:"buyer"`          //采购单位
 	Winner              string        `json:"winner"`         //中标企业
 	Agency              string        `json:"agency"`         //代理机构
-	MobileTag           string        `json:"mobileTag"`      //融创
+	MobileTag           []string      `json:"mobileTag"`      //融创
 }
 
 // NewSearchOptimize  初始化
-func NewSearchOptimize(mobileTag, userId, phone, province, city, district, subtype, topType, publishTime, selectType, price, industry, buyerClass, buyerTel, winnerTel, fileExists, keyWords, additionalWords, exclusionWords, platform, territorialization, expireTime, propertyForm, subinformation string,
+func NewSearchOptimize(mobileTag []string, userId, phone, province, city, district, subtype, topType, publishTime, selectType, price, industry, buyerClass, buyerTel, winnerTel, fileExists, keyWords, additionalWords, exclusionWords, platform, territorialization, expireTime, propertyForm, subinformation string,
 	pageNum, pageSize, searchGroup, searchMode, wordsMode int, period, scale string, changehand, isfile int,
 	userInfo jy.VipState, searchTypeSwitch bool, r *http.Request, accountId, entAccountId, entId, entUserId int64, buyer, winner, agency string) *SearchOptimize {
 	IsPay := userInfo.IsPayedUser()
@@ -556,8 +556,8 @@ func (so *SearchOptimize) GetSearchQuery(mustQuery string) (qstr string) {
 		musts = append(musts, fmt.Sprintf(queryBoolMustA, "tag_topinformation", `"情报_物业"`))
 	}
 	//移动融创
-	if so.MobileTag != "" && isLogin {
-		musts = append(musts, fmt.Sprintf(queryBoolMustA, "mobile_tag", `"`+strings.ReplaceAll(so.MobileTag, ",", `","`)+`"`))
+	if so.MobileTag != nil && len(so.MobileTag) > 0 && isLogin {
+		musts = append(musts, fmt.Sprintf(queryBoolMustA, "mobile_tag", strings.Join(so.MobileTag, `","'`)))
 	}
 	//物业业态
 	if so.PropertyForm != "" && isLogin {