Merge branch 'master' into hotfix/v4.8.68.1

src/jfw/front/shorturl.go

@@ -808,13 +808,14 @@ func FieldProcessing(obj map[string]interface{}, ssOpenid interface{}, industry,
 			href = "http://" + href
 		}
 		obj["url"] = href
+		obj["buyerSeoId"] = EsSeoId(false, util.InterfaceToStr(obj["buyer"]))
 	}
 	//P385 查看原文
 	obj["originalShow"] = false
 	if href != "" && userId != "" {
 		obj["originalShow"] = true
 	}
-	obj["buyerSeoId"] = EsSeoId(false, util.InterfaceToStr(obj["buyer"]))
+
 	//大会员中标企业跳转至画像
 	if obj["entidlist"] != nil {
 		if s_winner := util.ObjToString(obj["s_winner"]); s_winner != "" {
@@ -830,18 +831,25 @@ func FieldProcessing(obj map[string]interface{}, ssOpenid interface{}, industry,
 					if rData != nil && len(*rData) == 1 {
 						if entId := util.ObjToString((*rData)[0]["_id"]); entId != "" {
 							entIdArr = append(entIdArr, encrypt.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"])))
-							winnerMap[v] = (*rData)[0]["nseo_id"]
+							if b {
+								winnerMap[v] = encrypt.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"]))
+							} else {
+								winnerMap[v] = (*rData)[0]["nseo_id"]
+							}
 						}
 					}
 				}
 			} else {
 				for k, v := range eidList {
 					vstr := util.ObjToString(v)
-					if vstr == "-" {
+					if vstr == "-" || vstr == "" {
 						continue
 					}
-					entIdArr = append(entIdArr, encrypt.EncodeArticleId2ByCheck(util.ObjToString(k)))
-					winnerMap[swinnerArr[k]] = EsSeoId(true, vstr)
+					if b {
+						winnerMap[swinnerArr[k]] = encrypt.EncodeArticleId2ByCheck(vstr)
+					} else {
+						winnerMap[swinnerArr[k]] = EsSeoId(true, vstr)
+					}
 				}
 			}
 			obj["entId"] = entIdArr

src/jfw/modules/bigmember/src/service/search/search.go

@@ -22,7 +22,7 @@ type Search struct {
 }
 
 // 查询中标企业名称【带曾用名检索】
-const queryFullEntName = `{"query":{"function_score":{"query":{"multi_match":{"query":"%s","type":"phrase","fields":["name","history_name"]}},"field_value_factor":{"field":"company_type_int","modifier":"reciprocal","factor":2}}},"_source":["name","history_name","company_type_int","_id","company_area","company_city","establish_date","capital","company_phone","legal_person","tax_code","credit_no"],"size":%d}`
+const queryFullEntName = `{"query":{"function_score":{"query":{"multi_match":{"query":"%s","type":"phrase","fields":["name","history_name"]}},"field_value_factor":{"field":"company_type_int","modifier":"reciprocal","factor":2}}},"_source":["name","history_name","company_type_int","_id","company_area","company_city","establish_date","capital","company_phone","legal_person","tax_code","credit_no","nseo_id"],"size":%d}`
 
 func (s *Search) EntAssociation() {
 	if !R.CheckReqParam(s.ResponseWriter, s.Request, "name") {
@@ -39,16 +39,17 @@ func (s *Search) EntAssociation() {
 		if r != nil {
 			for _, v := range *r {
 				tmp := map[string]interface{}{
-                    "name":           v["name"],
-                    "entId":          util.EncodeId(qutil.ObjToString(v["_id"])),
-                    "company_area":   qutil.ObjToString(v["company_area"]),  //地区
-                    "company_city":   qutil.ObjToString(v["company_city"]),  //城市
-                    "establish_date": qutil.Int64All(v["establish_date"]),   //注册日期
-                    "capital":        qutil.Float64All(v["capital"]),        //注册资本
-                    "company_phone":  qutil.ObjToString(v["company_phone"]), //企业联系方式
-                    "legal_person":   qutil.ObjToString(v["legal_person"]),  //企业法人
-                    "taxCode":        qutil.ObjToString(v["credit_no"]),
-                }
+					"name":           v["name"],
+					"entId":          util.EncodeId(qutil.ObjToString(v["_id"])),
+					"company_area":   qutil.ObjToString(v["company_area"]),  //地区
+					"company_city":   qutil.ObjToString(v["company_city"]),  //城市
+					"establish_date": qutil.Int64All(v["establish_date"]),   //注册日期
+					"capital":        qutil.Float64All(v["capital"]),        //注册资本
+					"company_phone":  qutil.ObjToString(v["company_phone"]), //企业联系方式
+					"legal_person":   qutil.ObjToString(v["legal_person"]),  //企业法人
+					"taxCode":        qutil.ObjToString(v["credit_no"]),
+					"nseo_id":        qutil.ObjToString(v["nseo_id"]),
+				}
 				if timestamp := qutil.Int64All(v["establish_date"]); timestamp > 0 {
 					tmp["establish_date"] = time.Unix(timestamp, 0).Format(Date_Short_Layout)
 				}

src/web/staticres/js/ent-search-index-pc.js

@@ -1087,7 +1087,7 @@ var entSearch = new Vue({
               openLoginDig(null, svipLink)
               return
             } else {
-                if (!this.inIframe) {
+                if (!this.inIframe && seoId) {
                     // 工作桌面外跳转seo画像
                     return window.open(seoUrl)
                 }

src/web/templates/pc/supsearch.html

@@ -2007,6 +2007,11 @@
       // @2023/9/26 未登录限制搜索条件
       $(".no-login-mask").remove()
       $('#go-customer-4').removeClass('hide')
+      if(getParam('tab') === '2') {
+        searchInnerVue.searchTab = 2
+      } else {
+        searchInnerVue.searchTab = 1
+      }
       if(!goTemplateData.inIframe) {
         $('.nologin-hide').addClass('hide')
         $('.tab-detail-list').removeClass('hide')
@@ -2020,11 +2025,9 @@
         $('.search-tab-right').hide()
         $('.badge-recommend').show()
         $('.search-tab-item-0').show()
-      }
-      if(getParam('tab') === '2') {
-        searchInnerVue.searchTab = 2
-      } else {
-        searchInnerVue.searchTab = 1
+        if(!getParam('searchGroup')) {
+          searchInnerVue.searchTab = 0
+        }
       }
       $("#zbSeatchT [name='searchGroup']").val(searchInnerVue.searchTab)
       $('#setInfoBtn').text('信息发布')