Merge branch 'dev/v4.8.93.1_dx' of qmx/jy into hotfix/v4.8.93.1

src/jfw/front/shorturl.go

@@ -141,7 +141,7 @@ func (s *Short) Article(stype, id string) error {
 func (s *Short) LoginCommon(sess map[string]interface{}, stype, id string, bm bool) error {
 	log.Println(stype, "----stype:---", id)
 	//电脑端 剑鱼快照页面访问
-	if stype == "content" && !bm {
+	if !bm {
 		//工作桌面内嵌 快照页
 		//老地址（地址不包含aside）且非工作桌面地址
 		if !strings.Contains(s.Request.URL.String(), "aside") && !strings.Contains(s.Request.URL.String(), "page_workDesktop") {
@@ -819,7 +819,7 @@ func FieldProcessing(obj map[string]interface{}, ssOpenid interface{}, industry,
 	//大会员中标企业跳转至画像
 	if obj["entidlist"] != nil {
 		if s_winner := util.ObjToString(obj["s_winner"]); s_winner != "" {
-			entIdArr, winnerMap := []string{}, map[string]interface{}{}
+			entIdArr, winnerMap, winnerSeoMap := []string{}, map[string]interface{}{}, map[string]interface{}{}
 			swinnerArr := strings.Split(s_winner, ",")
 			eidList, _ := obj["entidlist"].([]interface{})
 			//先查询entlist 如果长度和s_winner不一致 根据企业名称查询id
@@ -831,10 +831,9 @@ 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"])))
-							if b {
-								winnerMap[v] = encrypt.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"]))
-							} else {
-								winnerMap[v] = (*rData)[0]["nseo_id"]
+							winnerMap[v] = encrypt.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"]))
+							if !b {
+								winnerSeoMap[v] = (*rData)[0]["nseo_id"]
 							}
 						}
 					}
@@ -845,15 +844,15 @@ func FieldProcessing(obj map[string]interface{}, ssOpenid interface{}, industry,
 					if vstr == "-" || vstr == "" {
 						continue
 					}
-					if b {
-						winnerMap[swinnerArr[k]] = encrypt.EncodeArticleId2ByCheck(vstr)
-					} else {
-						winnerMap[swinnerArr[k]] = EsSeoId(true, vstr)
+					winnerMap[swinnerArr[k]] = encrypt.EncodeArticleId2ByCheck(vstr)
+					if !b {
+						winnerSeoMap[swinnerArr[k]] = EsSeoId(true, vstr)
 					}
 				}
 			}
 			obj["entId"] = entIdArr
 			obj["winnerMap"] = winnerMap
+			obj["winnerSeoId"] = winnerSeoMap
 		}
 	}
 	//移动端需要处理--剑鱼币