xg

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

@@ -18,6 +18,7 @@ import (
 	"jy/src/jfw/modules/publicapply/src/detail/util"
 	"log"
 	"net/http"
+	"strings"
 	"time"
 )
 
@@ -55,6 +56,11 @@ func (b *BaseInfo) BidBaseInfo() (bi *entity.BidInfo, err error) {
 		CanRead:   false,
 		Topnet:    false,
 	}
+	resResp := config.Middleground.ResourceCenter.Haspowers(b.UserInfo.AccountId, b.UserInfo.EntAccountId, b.UserInfo.EntId, b.UserInfo.EntUserId)
+	if resResp != nil && strings.Contains(strings.Join(resResp.Powers, ","), "bi_yx_topnet") {
+		log.Println(":--BaseInfo--:", resResp.Powers)
+		bi.Topnet = true
+	}
 	//招标数据基本信息并发过滤
 	if dc.Config.RestrictionSwitch {
 		if err = rest.ReqCheck("baseInfo"); err != nil {
@@ -95,7 +101,10 @@ func (b *BaseInfo) BidBaseInfo() (bi *entity.BidInfo, err error) {
 	}
 	//redis 缓存数据
 	var detailKey = func() string {
-		if (isVip && isOldVip) || isMember || isEntniche || pageTypeCheck[b.PageType] || privateData {
+		if bi.Topnet {
+			bi.CanRead = true
+			return "pay" //可以看全部
+		} else if (isVip && isOldVip) || isMember || isEntniche || pageTypeCheck[b.PageType] || privateData {
 			bi.CanRead = true
 			return "pay" //可以看全部
 		} else if isVip && !isOldVip {
@@ -118,7 +127,7 @@ func (b *BaseInfo) BidBaseInfo() (bi *entity.BidInfo, err error) {
 			return
 		}
 		//权限判断 处理
-		if detailKey == "new_vip_pay" || detailKey == "saleLeads_free" { //新版超级订阅||免费用户   不能看采购意向和拟建
+		if !bi.Topnet && (detailKey == "new_vip_pay" || detailKey == "saleLeads_free") { //新版超级订阅||免费用户   不能看采购意向和拟建
 			if subtype == "拟建" || subtype == "采购意向" {
 				bi.CanRead = false
 			}

src/jfw/modules/publicapply/src/detail/service/service.go

@@ -4,11 +4,8 @@ import (
 	. "app.yhyue.com/moapp/jybase/api"
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
-	"jy/src/jfw/modules/publicapply/src/config"
 	"jy/src/jfw/modules/publicapply/src/detail/dao"
 	"jy/src/jfw/modules/publicapply/src/detail/util"
-	"log"
-	"strings"
 )
 
 // AdvancedInfo 招标数据进阶信息（招标/采购进度、投标服务、商机推荐、客户推荐）
@@ -69,12 +66,6 @@ func (d *Detail) BaseInfo() {
 			return Result{Data: nil, Error_msg: Error_msg_1001}
 		}
 		data, err1 := baseInfo.BidBaseInfo()
-		resResp := config.Middleground.ResourceCenter.Haspowers(ub.AccountId, ub.EntAccountId, ub.EntId, ub.EntUserId)
-		if resResp != nil && strings.Contains(strings.Join(resResp.Powers, ","), "bi_yx_topnet") {
-			log.Println(":--BaseInfo--:", resResp.Powers)
-			data.Topnet = true
-			data.CanRead = true
-		}
 		if err1 != nil {
 			return Result{Error_code: -1, Error_msg: err1.Error()}
 		}