fix:画像空跳转处理

src/jfw/front/shorturl.go

@@ -215,35 +215,28 @@ func (s *Short) Article(stype, id string) error {
 			s.T["obj"] = obj
 			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)
 					}
-					//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 != "" {
-					//	obj["entId"] = util.EncodeArticleId2ByCheck(winnerId)
-					//}
 				}
 			}
 			if from_userid != "" && se.Decode4Hex(from_userid) != "" && se.Decode4Hex(from_userid) != userId && util.ObjToString(obj["subtype"]) != "拟建" { //分享开打的
@@ -266,7 +259,6 @@ func (s *Short) Article(stype, id string) error {
 		}
 	} else {
 		sids := util.CommonDecodeArticle(stype, id)
-		log.Println(sids)
 		if len(sids) == 0 || (len(sids) > 0 && sids[0] == "") {
 			s.Redirect("/notin/page", 302)
 			return nil
@@ -334,29 +326,30 @@ func (s *Short) Article(stype, id string) error {
 					s.SetSession("projectname", obj["projectname"])
 				}
 				if obj["entidlist"] != nil { //大会员中标企业跳转至画像
-					winner := util.ObjToString(obj["winner"])
-					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 winner := util.ObjToString(obj["winner"]); winner != "" {
+						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 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)
 						}
 					}
-					if winnerId != "" {
-						obj["entId"] = util.EncodeArticleId2ByCheck(winnerId)
-					}
 				}
 				s.T["url"] = s.Uri()
 

src/web/staticres/public-pc/js/article-content.js

@@ -587,7 +587,7 @@ if(adv[x]== zb_adv){
 }
 if (adv[x]==any_adv[0]){
   btn_text="立即查看";
-} 
+}
 
 $(".adv_tosieve-btn").text(btn_text)
 $(".join").attr("adv_name",fromwhere(adv[x]));
@@ -1328,6 +1328,9 @@ $(function(){
         return
       }
     }
+    if(!goTemplateData.params.obj.entId){
+      return;
+    }
     if (isMember) {
       // 如果是专家版、智慧版 跳大会员页面
       if(window.memberStatus > 0 && window.memberPower && window.memberPower.indexOf(4) !== -1) {