Merge branch 'dev/v4.8.56_fuwencai' of qmx/jy into feature/v4.8.56

src/jfw/front/classificationTag.go

@@ -363,7 +363,8 @@ func NewIndexbids(session *httpsession.Session, r *http.Request) []map[string]in
 		_, total, _ := so.GetBidSearchList(true)
 		data.Count = total
 	*/
-	_, _, lists := bidsearch.GetPcBidSearchData("", "", "", "", "拟建,招标预告,招标公告,招标结果,招标信用信息", "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", 10, "")
+	// p397 收回查看拟建权限
+	_, _, lists := bidsearch.GetPcBidSearchData("", "", "", "", "招标预告,招标公告,招标结果,招标信用信息", "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", 10, "")
 	if lists != nil {
 		for _, v1 := range *lists {
 			v1["_id"] = encrypt.CommonEncodeArticle("content", v1["_id"].(string))

src/jfw/front/pcIndex.go

@@ -383,7 +383,7 @@ func (f *PcIndex) SearchResult(at, name string) error {
 	userId := util.ObjToString(f.GetSession("userId"))
 	// p397 未登录收回查看拟建项目权限
 	// 如果用户未登录访问拟建项目 重定向到登录页面
-	if userId == "" && strings.Contains(name, "NJ") {
+	if userId == "" && name == "NJXM" {
 		return f.Redirect("/notin/page")
 	}
 	var no = 5
@@ -541,12 +541,11 @@ func (f *PcIndex) SearchResult(at, name string) error {
 		query1 += `],"should": [],"minimum_should_match": 0}}}`
 		//p353包含采购意向与拟建
 		//获取到昨天数据
-		if stype == "" && userId == "" {
+		if stype == "" {
 			// stype = "招标预告,招标公告,招标结果,招标信用信息"
-			// p397 未登录用户收回拟建权限
+			// p397 不查拟建
 			stype = "招标,询价,竞谈,变更,单一,竞价,邀标,成交,中标,废标,流标,结果变更,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果"
 		}
-
 		var datas *[]map[string]interface{}
 		if list == nil || len(list.([]interface{})) == 0 {
 			if keywords == "" {

src/jfw/front/shorturl.go

@@ -397,7 +397,7 @@ func (s *Short) LoginCommon(userId, stype, id string, bm bool) error {
 			s.T["canRead"] = canRead
 		}
 		if len(obj) > 0 {
-			if canRead || util.ObjToString(obj["subtype"]) == "拟建" {
+			if canRead {
 				FieldProcessing(obj, ssOpenid, industry, id, from_userid, userId, stype, true)
 				//免费用户正文手机号替换
 				if obj["site"] == "剑鱼信息发布平台" && !isMember {
@@ -540,7 +540,7 @@ func (s *Short) LoginCommon(userId, stype, id string, bm bool) error {
 				if newCanRead {
 					s.T["canRead"] = newCanRead
 				}
-				if node || util.ObjToString(obj["subtype"]) == "拟建" {
+				if node {
 					if len(po) > 0 {
 						s.T["projectOther"] = po
 					}
@@ -1208,7 +1208,8 @@ func (s *Short) NologinCommon(userId, stype, id, sid string) error {
 		s.DisableHttpCache()
 		po, bo, wo, obj := pcVRT(sid, industry, stype, false)
 		if obj != nil && len(obj) > 0 {
-			if obj["subtype"] == "采购意向" { //未登录不能访问采购意向
+			// p397 未登录不能查看拟建项目
+			if obj["subtype"] == "采购意向" || obj["subtype"] == "拟建" { //未登录不能访问采购意向
 				return s.Redirect("/notin/page", 302)
 			}
 			if len(po) > 0 {

src/jfw/front/tags.go

@@ -122,7 +122,6 @@ func (this *Tags) Index(types, name string) {
 		checkedIndustry = ""
 	}
 	filters["area"] = this.T["area"]
-
 	InfoType, filterInfoType := this.GetInfoType(checkedInfoType)
 	infotypeStr := ""
 	if checkedInfoType != "all" {
@@ -462,7 +461,8 @@ func (this *Tags) GetNewBidInfo() (list []map[string]interface{}) {
 	if l, ok := redis.Get("seoCache", rediskey).([]interface{}); ok && l != nil && len(l) > 0 {
 		list = qu.ObjArrToMapArr(l)
 	} else {
-		_, _, lists := bidsearch.GetPcBidSearchData("", "", "", "", "拟建,招标预告,招标公告,招标结果,招标信用信息", "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", 50, "")
+		// p397 未登录详情页最新招投标信息去掉拟建
+		_, _, lists := bidsearch.GetPcBidSearchData("", "", "", "", "招标预告,招标公告,招标结果,招标信用信息", "", "", "", "", "", "", "", "", 1, false, nil, bidSearch_field_1, "", false, false, "", 50, "")
 		if lists != nil && len(*lists) > 10 {
 			*lists = (*lists)[0:10]
 			for _, v := range *lists {
@@ -762,9 +762,10 @@ func (this *Tags) GetInsturyKeywords(idstr string) (name, class_1, class_2 strin
 
 // 获取信息类型 【全部是虚假的全部、实则是不包含拟建和采购意向的全部】
 // p353包含采购意向与拟建
+// p397 不包含拟建
 func (this *Tags) GetInfoType(idstr string) (string, string) {
 	if idstr == "all" {
-		return "拟建,招标,邀标,询价,竞谈,单一,竞价,变更,中标,成交,废标,流标,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果", ""
+		return "招标,邀标,询价,竞谈,单一,竞价,变更,中标,成交,废标,流标,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果", ""
 		//return "", ""
 	}
 	id, _ := strconv.Atoi(idstr)