Merge branch 'dev/v4.8.91.1_dx' of qmx/jy into hotfix/v4.8.91.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,7 +831,11 @@ 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"]
+							}
 						}
 					}
 				}
@@ -841,7 +846,11 @@ func FieldProcessing(obj map[string]interface{}, ssOpenid interface{}, industry,
 						continue
 					}
 					entIdArr = append(entIdArr, encrypt.EncodeArticleId2ByCheck(util.ObjToString(k)))
-					winnerMap[swinnerArr[k]] = EsSeoId(true, vstr)
+					if b {
+						winnerMap[swinnerArr[k]] = encrypt.EncodeArticleId2ByCheck(util.ObjToString(k))
+					} else {
+						winnerMap[swinnerArr[k]] = EsSeoId(true, vstr)
+					}
 				}
 			}
 			obj["entId"] = entIdArr