Эх сурвалжийг харах

fix:提交画像跳转三级页

wangkaiyue 3 жил өмнө
parent
commit
cb46dcff40

+ 20 - 6
src/jfw/modules/app/src/app/front/shorturl.go

@@ -4,7 +4,6 @@ import (
 	"database/sql"
 	"fmt"
 	"jfw/config"
-	"qfw/util/elastic"
 	"strconv"
 	"strings"
 	"time"
@@ -126,12 +125,27 @@ func (s *Short) Article(stype, id string) error {
 		obj["ucbsId"] = util.EncodeArticleId2ByCheck("ucbs#" + userId + "#" + id)
 		if obj["entidlist"] != nil { //大会员中标企业跳转至画像
 			if winner := util.ObjToString(obj["winner"]); winner != "" {
-				//临时更改为企业名称查询企业id
-				rData := elastic.Get("qyxy", "qyxy", fmt.Sprintf(`{"query":{"bool":{"should":[{"term":{"company_name":"%s"}},{"term":{"hname":"%s"}}],"minimum_should_match":1}},"_source":["name","_id","capital","company_phone"],"size":1}`, winner, winner))
-				if rData != nil && len(*rData) == 1 {
-					if entId := util.ObjToString((*rData)[0]["_id"]); entId != "" {
-						obj["entId"] = util.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"]))
+				s_winner := util.ObjToString(obj["s_winner"])
+				idObjs, _ := obj["entidlist"].([]interface{})
+				winnerId := ""
+				if names := strings.Split(s_winner, ","); len(names) > 1 {
+					index := 0
+					for i := 0; i < len(names); i++ {
+						if names[i] == winner {
+							index = i
+							break
+						}
+					}
+					if len(idObjs) > index {
+						winnerId = util.ObjToString(idObjs[index])
 					}
+				} else { //中标企业仅一个
+					if len(idObjs) > 0 {
+						winnerId = util.ObjToString(idObjs[0])
+					}
+				}
+				if winnerId != "" && winnerId != "-" {
+					obj["entId"] = util.EncodeArticleId2ByCheck(winnerId)
 				}
 			}
 		}