Merge remote-tracking branch 'origin/feature/v4.8.0' into feature/v4.8.0

src/jfw/jyutil/classroomiInfo.go

@@ -502,7 +502,7 @@ func GuidelineDetails(id string, keyWord ...string) []map[string]interface{} {
 	}
 	//相关内容推荐
 	query["_id"] = map[string]interface{}{
-		"$ne": []primitive.ObjectID{_id},
+		"$ne": _id,
 	}
 
 	log.Println(" 详情页 推荐3", query)

src/jfw/site/jySchool/school.go

@@ -40,7 +40,6 @@ func Consultation(n string, num int) map[string]interface{} {
 	)
 	req := make(map[string]interface{})
 	columnCode, _ := config.Sysconfig["columnCode"].(map[string]interface{})
-
 	//热点咨询
 	query := map[string]interface{}{"s_contenttype": util.InterfaceToStr(columnCode["行业资讯"]), "i_status": 1, "releasetime": map[string]interface{}{"$lt": time.Now().Unix()}} //调用行业资讯板块内内容 随机显示10篇
 	data1, ok := mongodb.Find("content", query, `{"releasetime":-1,"l_createdate":-1}`, `{"_id":1,"i_viewnum":1,"s_title":1,"s_pic1":1,"s_pic":1,"releasetime":1,"s_description":1,"l_createdate":1,"s_contenttype":1,"s_secondclassifytype":1}`, false, 0, 500)
@@ -62,7 +61,7 @@ func Consultation(n string, num int) map[string]interface{} {
 	//重要咨询 important
 	query["s_contenttype"] = "ztbgl" //调用招投标攻略的当前栏目外的其他栏目内容
 	query["s_secondclassifytype"] = map[string]interface{}{
-		"$ne": []string{n},
+		"$ne": n,
 	}
 	data2, ok := mongodb.Find("content", query, `{"releasetime":-1,"l_createdate":-1}`, `{"_id":1,"i_viewnum":1,"s_title":1,"s_pic1":1,"s_pic":1,"releasetime":1,"s_description":1,"l_createdate":1,"s_contenttype":1,"s_secondclassifytype":1}`, false, 0, 500)
 	if ok && data2 != nil && len(*data1) > 0 {

src/web/templates/pc/index.html

@@ -108,7 +108,7 @@
                 <div class="p-name">招标代理机构服务</div>
                 <div class="p-detail">帮招标代理机构推荐可信赖的供应商、采购单位，拓宽采购的渠道！</div>
               </div>
-              <div class="product-item other-product-item data-market-product" data-href="/front/structed/pc_index.html">
+              <div class="product-item other-product-item data-market-product" data-href="/front/dataMarket/index">
                 <div class="p-link">了解详情</div>
                 <div class="p-name">数据市场</div>
                 <div class="p-detail">1.8亿+ 条招标数据开放交易，根据企业自身需求自行构建各类数据应用！</div>