feat:p397 pc未登录信息类型、搜索结果去掉拟建

src/jfw/front/pcIndex.go

@@ -104,6 +104,22 @@ func (m *PcIndex) NewSordfish(flag string) error {
 			for _, v := range []int{1, 2, 3} {
 				m.T[fmt.Sprintf("labUrl_%d", v)] = GetLabUrl(v) //1地域 2信息类型 3热门招标
 			}
+			if util.ObjToString(m.GetSession("userId")) == "" {
+				appendData := []interface{}{}
+				if labUrl_2, ok := m.T["labUrl_2"].([]map[string][]map[string]interface{}); ok {
+					for i := 0; i < len(labUrl_2); i++ {
+						labUrl_ := labUrl_2[i]
+						if labUrl_ != nil {
+							if _, ok := (labUrl_)["拟建项目"]; ok {
+								continue
+							}
+							appendData = append(appendData, labUrl_)
+						}
+					}
+					m.T["labUrl_2"] = appendData
+				}
+
+			}
 			return m.Render("/pc/index_old.html", &m.T)
 		} else if flag == "tmp" {
 			return m.Render("/pc/index_tmp.html", &m.T)
@@ -117,6 +133,22 @@ func (m *PcIndex) NewSordfish(flag string) error {
 			for k, v := range RegionAndInformationAndTender() {
 				m.T[k] = v
 			}
+			// p397 未登录信息类型不展示拟建
+			if util.ObjToString(m.GetSession("userId")) == "" {
+				appendData := []interface{}{}
+				labUrl_2 := m.T["labUrl_2"].([]interface{})
+				for i := 0; i < len(labUrl_2); i++ {
+					labUrl_ := util.ObjToMap(labUrl_2[i])
+					if labUrl_ != nil {
+						if _, ok := (*labUrl_)["拟建项目"]; ok {
+							continue
+						}
+						appendData = append(appendData, labUrl_)
+					}
+				}
+				m.T["labUrl_2"] = appendData
+
+			}
 			//热门标的物
 			m.T["hotSubject"] = HotSubjectMatter()
 			//实用内容推荐
@@ -349,6 +381,11 @@ func (f *PcIndex) SearchResult(at, name string) error {
 	//	return f.Redirect("/jylab/supsearch/proposedProject.html")
 	//}
 	userId := util.ObjToString(f.GetSession("userId"))
+	// p397 未登录收回查看拟建项目权限
+	// 如果用户未登录访问拟建项目 重定向到登录页面
+	if userId == "" && strings.Contains(name, "NJ") {
+		return f.Redirect("/notin/page")
+	}
 	var no = 5
 	var area = ""
 	var stype = ""
@@ -506,7 +543,8 @@ func (f *PcIndex) SearchResult(at, name string) error {
 		//获取到昨天数据
 		if stype == "" && userId == "" {
 			// stype = "招标预告,招标公告,招标结果,招标信用信息"
-			stype = "拟建,招标,询价,竞谈,变更,单一,竞价,邀标,成交,中标,废标,流标,结果变更,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果"
+			// p397 未登录用户收回拟建权限
+			stype = "招标,询价,竞谈,变更,单一,竞价,邀标,成交,中标,废标,流标,结果变更,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果"
 		}
 
 		var datas *[]map[string]interface{}

src/jfw/front/supsearch.go

@@ -348,17 +348,17 @@ func (p *Pcsearch) PcSearchIndex(module string) error {
 	noLoginBl := false
 	if userId == "" {
 		//未登录用户访问全部信息类型 需要过滤掉 拟建
-		if strings.Contains(subtype, "采购意向") {
+		if strings.Contains(subtype, "采购意向") || strings.Contains(subtype, "拟建") {
 			var ss []string
 			for _, v := range strings.Split(subtype, ",") {
-				if v != "采购意向" {
+				if v != "采购意向" && !strings.Contains(v, "拟建") {
 					ss = append(ss, v)
 				}
 			}
 			subtype = strings.Join(ss, ",")
 		}
 		if subtype == "" {
-			subtype = "拟建,招标预告,招标公告,招标结果,招标信用信息"
+			subtype = "招标预告,招标公告,招标结果,招标信用信息"
 			noLoginBl = true
 		}
 	}