Merge branch 'master' into hotfix/v4.9.82.2

src/jfw/modules/publicapply/src/detail/dao/baseInfo.go

@@ -183,7 +183,7 @@ func (b *BaseInfo) BidBaseInfo() (bi *BidInfo, err error) {
 		}
 		if bi.CanRead {
 			//数据格式化
-			bi.BiddingDataFormat(obj, b.Id)
+			bi.BiddingDataFormat(obj, b)
 			if !b.IsMobile {
 				//地址 电脑端
 				switch {
@@ -270,7 +270,7 @@ func (b *BaseInfo) MinBidBaseInfo() (bi *BidInfo, err error) {
 			Abstract: &entity.Abstract{},
 			Detail:   &entity.DetailInfo{},
 		}
-		bi.BiddingDataFormat(obj, b.Id)
+		bi.BiddingDataFormat(obj, b)
 		if !b.IsMobile {
 			//地址 电脑端
 			switch {

src/jfw/modules/publicapply/src/detail/dao/bidding.go

@@ -258,9 +258,9 @@ func (bi *BidInfo) BiddingDataFormatNoPower(obj map[string]interface{}, id strin
 }
 
 // wx pc obj字段统一处理
-func (bi *BidInfo) BiddingDataFormat(obj map[string]interface{}, id string) {
+func (bi *BidInfo) BiddingDataFormat(obj map[string]interface{}, b *BaseInfo) {
 	//基本信息
-	bi.BaseInfo.Id = encrypt.EncodeArticleId2ByCheck(id)
+	bi.BaseInfo.Id = encrypt.EncodeArticleId2ByCheck(b.Id)
 	if bId := common.InterfaceToStr(obj["bid"]); bId != "" {
 		bi.BaseInfo.BId = encrypt.EncodeArticleId2ByCheck(bId)
 	}
@@ -424,19 +424,20 @@ func (bi *BidInfo) BiddingDataFormat(obj map[string]interface{}, id string) {
 	obj["infoformat"] = infoFormat //信息类型，1代表标讯，2代表拟建，3代表产权
 	//href="#"为竞品
 	href := common.ObjToString(obj["href"])
-	//运营商专版
-	if bi.Operator {
+	//运营商专版权限 且 运营商专版搜索入口
+	if bi.Operator && b.PageType == "yyszb" {
 		bi.Detail.OriginalHref = href
 		if href != "" {
 			bi.Detail.OriginalShow = true
 		}
 		if winners != "" {
-			bi.Abstract.Default.WinnerInfos = []entity.WinnerInfo{}
-			bi.Abstract.Default.WinnerInfos = append(bi.Abstract.Default.WinnerInfos, entity.WinnerInfo{
-				Winner:       winners,
-				WinnerPerson: common.ObjToString(obj["winnerperson"]),
-				WinnerTel:    common.ObjToString(obj["winnertel"]),
-			})
+			bi.Abstract.Default.WinnerInfos = []entity.WinnerInfo{
+				{
+					Winner:       winners,
+					WinnerPerson: common.ObjToString(obj["winnerperson"]),
+					WinnerTel:    common.ObjToString(obj["winnertel"]),
+				},
+			}
 		}
 	} else {
 		//竞品及剑鱼信息发布的招标信息，不显示查看原文