fix:353采购意向打码处理逻辑回退

src/jfw/front/pcIndex.go

@@ -292,7 +292,7 @@ func (f *PcIndex) SearchResult(at, name string) error {
 	if at == "stype" && name == "NJ" {
 		return f.Redirect("/jylab/supsearch/proposedProject.html")
 	}
-	//userId := util.ObjToString(f.GetSession("userId"))
+	userId := util.ObjToString(f.GetSession("userId"))
 	var no = 5
 	var area = ""
 	var stype = ""
@@ -419,10 +419,10 @@ func (f *PcIndex) SearchResult(at, name string) error {
 		query1 += `],"should": [],"minimum_should_match": 0}}}`
 		//p353包含采购意向与拟建
 		//获取到昨天数据
-		//if stype == "" && userId == "" {
-		//	// stype = "招标预告,招标公告,招标结果,招标信用信息"
-		//	stype = "拟建,采购意向,招标,询价,竞谈,变更,单一,竞价,邀标,成交,中标,废标,流标,结果变更,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果"
-		//}
+		if stype == "" && userId == "" {
+			// stype = "招标预告,招标公告,招标结果,招标信用信息"
+			stype = "拟建,招标,询价,竞谈,变更,单一,竞价,邀标,成交,中标,废标,流标,结果变更,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果"
+		}
 
 		var datas *[]map[string]interface{}
 		if list == nil || len(list.([]interface{})) == 0 {
@@ -505,7 +505,7 @@ func getstypeMap() []map[string][]map[string]interface{} {
 		}
 	}
 	m2 := []map[string][]map[string]interface{}{} //结构整理 返给前端
-	stype_1reg := []string{"招标公告", "招标结果", "招标信用信息", "招标预告", "拟建项目", "采购意向"}
+	stype_1reg := []string{"招标公告", "招标结果", "招标信用信息", "招标预告", "拟建项目"}
 	hotlabstypSort := config.Seoconfig["hotlabstypSort"].([]interface{})
 	notice := util.ObjArrToStringArr(hotlabstypSort[0].([]interface{}))
 	result := util.ObjArrToStringArr(hotlabstypSort[1].([]interface{}))

src/jfw/front/shorturl.go

@@ -388,7 +388,7 @@ func (s *Short) LoginCommon(userId, stype, id string) error {
 			s.T["canRead"] = canRead
 		}
 		if len(obj) > 0 {
-			if canRead || (util.ObjToString(obj["subtype"]) == "拟建" || util.ObjToString(obj["subtype"]) == "采购意向") {
+			if canRead || util.ObjToString(obj["subtype"]) == "拟建" {
 				FieldProcessing(obj, ssOpenid, industry, id, from_userid, userId, stype, true)
 				//免费用户正文手机号替换
 				if obj["site"] == "剑鱼信息发布平台" && !isMember {
@@ -520,7 +520,7 @@ func (s *Short) LoginCommon(userId, stype, id string) error {
 				}
 				s.T["canRead"] = canRead
 			}
-			if node || (util.ObjToString(obj["subtype"]) == "拟建" || util.ObjToString(obj["subtype"]) == "采购意向") {
+			if node || util.ObjToString(obj["subtype"]) == "拟建" {
 				if len(po) > 0 {
 					s.T["projectOther"] = po
 				}
@@ -1184,7 +1184,7 @@ func (s *Short) NologinCommon(userId, stype, id, sid string) error {
 			obj["projectnameTitle"] = obj["projectname"]
 			obj["projectcodeTitle"] = obj["projectcode"]
 			log.Println(time.Now().UnixNano())
-			if obj["subtype"] == "拟建" || obj["subtype"] == "采购意向" {
+			if obj["subtype"] == "拟建" {
 				otherFilter(obj, false)
 			} else {
 				obj = Filter(obj)

src/jfw/front/supsearch.go

@@ -344,14 +344,14 @@ func (p *Pcsearch) PcSearchIndex(module string) error {
 	userId, _ := p.GetSession("userId").(string)
 	phone, _ := p.GetSession("phone").(string)
 	//p353包含采购意向与拟建
-	//noLoginBl := false
-	//if userId == "" {
-	//	//未登录用户访问全部信息类型 需要过滤掉 拟建和采购意向
-	//	if subtype == "" {
-	//		subtype = "招标预告,招标公告,招标结果,招标信用信息"
-	//		noLoginBl = true
-	//	}
-	//}
+	noLoginBl := false
+	if userId == "" {
+		//未登录用户访问全部信息类型 需要过滤掉 拟建和采购意向
+		if subtype == "" {
+			subtype = "拟建,招标预告,招标公告,招标结果,招标信用信息"
+			noLoginBl = true
+		}
+	}
 	//高级筛选 仅vip用户可查询
 	var (
 		hasBuyerTel, hasWinnerTel = "", "" //是否有采购单位电话、是否有中标单位电话 y:有 n:没有
@@ -468,9 +468,9 @@ func (p *Pcsearch) PcSearchIndex(module string) error {
 			list, count, total = so.GetBidSearchListByCache()
 		}
 	}
-	//if noLoginBl {
-	//	subtype = ""
-	//}
+	if noLoginBl {
+		subtype = ""
+	}
 	log.Println("userId:+++", userId)
 	if userId == "" {
 		for _, v := range list {
@@ -596,7 +596,7 @@ func Newbids(p, userId string) []map[string]interface{} {
 			}
 			//未登录用户访问全部信息类型 需要过滤掉 拟建和采购意向
 			if subtype == "" {
-				subtype = "招标预告,招标公告,招标结果,招标信用信息"
+				subtype = "拟建,招标预告,招标公告,招标结果,招标信用信息"
 			}
 		}
 		//查询置顶信息

src/jfw/front/swordfish.go

@@ -278,7 +278,7 @@ func (m *Front) PcAjaxReq_Bak() {
 	if userId == "" {
 		//未登录用户访问全部信息类型 需要过滤掉 拟建和采购意向
 		if subtype == "" {
-			subtype = "招标预告,招标公告,招标结果,招标信用信息"
+			subtype = "拟建,招标预告,招标公告,招标结果,招标信用信息"
 		}
 	}
 	m.SetSession("selectType", selectType)

src/jfw/front/tags.go

@@ -435,7 +435,7 @@ func (this *Tags) GetNewBidInfo() (list []map[string]interface{}) {
 	if l, ok := redis.Get("other", 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, "")
+		_, _, 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 {
@@ -466,11 +466,12 @@ func (this *Tags) GetStype(href string) (list []map[string]interface{}) {
 	} else {
 		m := []map[string]interface{}{}
 		var data []map[string]interface{}
-		newData := public.BaseMysql.SelectBySql(`select id,name,pid from seo_words.seo_stype where name = "拟建项目" or name = "采购意向" order by id`)
-		if newData != nil && len(*newData) > 0 {
-			data = append(data, *newData...)
-		}
-		oldData := public.BaseMysql.SelectBySql(`select id,name,pid from seo_words.seo_stype where  name != "拟建项目" and name != "采购意向" order by id`)
+		//newData := public.BaseMysql.SelectBySql(`select id,name,pid from seo_words.seo_stype where name = "拟建项目" or name = "采购意向" order by id`)
+		//if newData != nil && len(*newData) > 0 {
+		//	data = append(data, *newData...)
+		//}
+		//oldData := public.BaseMysql.SelectBySql(`-- select id,name,pid from seo_words.seo_stype where  name != "拟建项目" and name != "采购意向" order by id`)
+		oldData := public.BaseMysql.SelectBySql(`select id,name,pid from seo_words.seo_stype order by id`)
 		if oldData != nil && len(*oldData) > 0 {
 			data = append(data, *oldData...)
 		}
@@ -737,8 +738,8 @@ func (this *Tags) GetInsturyKeywords(idstr string) (name, class_1, class_2 strin
 // p353包含采购意向与拟建
 func (this *Tags) GetInfoType(idstr string) (string, string) {
 	if idstr == "all" {
-		//return "招标,邀标,询价,竞谈,单一,竞价,变更,中标,成交,废标,流标,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果", ""
-		return "", ""
+		return "拟建,招标,邀标,询价,竞谈,单一,竞价,变更,中标,成交,废标,流标,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果", ""
+		//return "", ""
 	}
 	id, _ := strconv.Atoi(idstr)
 	data := public.BaseMysql.SelectBySql(`select id,name from seo_words.seo_stype where id =?`, id)

src/jfw/modules/app/src/app/front/shorturl.go

@@ -188,7 +188,7 @@ func (s *Short) Article(stype, id string) error {
 			}
 			s.T["canRead"] = canRead
 		}
-		if canRead || userId == "" || (util.ObjToString(obj["subtype"]) == "拟建" || util.ObjToString(obj["subtype"]) == "采购意向") {
+		if canRead || userId == "" || util.ObjToString(obj["subtype"]) == "拟建" {
 			if belongUserId != "" && belongUserId != userId && util.ObjToString(obj["subtype"]) != "拟建" && userId != "" { //分享开打的
 				article_id := encrypt.CommonDecodeArticle(stype, id)[0]
 				key := fmt.Sprintf("integral_article_%s_%s_%s", article_id, belongUserId, userId)