Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_clpt into crm/crm_16.5

controllers/article.go

@@ -241,8 +241,27 @@ func (this *ArticleController) Detail() {
 			//		}
 			//	}
 			//}
+
+			//如果是下面这几种类型的不用校验主客观权限
+			var NocheckPerssionZK bool //是否需要校验主观客观权限
+			if detail.SeriesName == "产业跟踪" {
+				NocheckPerssionZK = true
+			}
+			if detail.ChartPermissionName == "医药" && detail.SeriesName == "医药周报" {
+				NocheckPerssionZK = true
+			}
+			if detail.ChartPermissionName == "消费" && (detail.SeriesName == "消费周报" || detail.SeriesName == "周度思考") {
+				NocheckPerssionZK = true
+			}
+			if detail.ChartPermissionName == "科技" && detail.SeriesName == "科技前言（周报）" {
+				NocheckPerssionZK = true
+			}
+			if detail.ChartPermissionName == "智造" && (detail.SeriesName == "本周荟" || detail.SeriesName == "智造精粹") {
+				NocheckPerssionZK = true
+			}
+
 			//大行业通过权限校验，再校验主客观权限。只有医药、消费、科技、智造，才会校验主客观权限，热点问答这个匹配类型下的所有报告，也不做主客观校验
-			if hasPersion && utils.InArrayByStr([]string{utils.YI_YAO_NAME, utils.XIAO_FEI_NAME, utils.KE_JI_NAME, utils.ZHI_ZAO_NAME}, articlePermissionName) && matchTypeName != "热点问答" {
+			if !NocheckPerssionZK && hasPersion && utils.InArrayByStr([]string{utils.YI_YAO_NAME, utils.XIAO_FEI_NAME, utils.KE_JI_NAME, utils.ZHI_ZAO_NAME}, articlePermissionName) && matchTypeName != "热点问答" {
 				hasPersion = services.CheckArticlePermissionType(articleId, user)
 			}
 			if !hasPersion {

models/article.go

@@ -82,6 +82,7 @@ type ArticleDetail struct {
 	ShareImg                 string          `description:"分享图片"`
 	ChartPermissionName      string          `description:"行业名称"`
 	Stock                    string          `description:"个股标签"`
+	SeriesName               string          `description:"策略平台系列名称"`
 }
 
 type CygxArticleIdReq struct {

models/home.go

@@ -85,8 +85,9 @@ type ArticleListResp struct {
 	SpecialColumnId     int      `description:"专栏栏目id"`
 	SpecialType         int      `description:"专栏类型 1:笔记，2:观点"`
 	List                []*IndustrialManagementIdInt
-	TopTime             int `description:"置顶时间"`
-	ReportId            int `description:"FICC研报ID"`
+	TopTime             int    `description:"置顶时间"`
+	ReportId            int    `description:"FICC研报ID"`
+	SubCategoryName     string `description:"二级分类"`
 }
 
 type HomeChartListResp struct {

models/report.go

@@ -1297,6 +1297,7 @@ func GetReportAndproductIndustrylListimgZhouqi(condition string, startSize, page
 			art.category_id,
 			art.title,
 			art.publish_date,
+			art.sub_category_name,
 			1 AS resource 
 		FROM
 			cygx_article AS art 

services/article.go

@@ -229,6 +229,10 @@ func HandleArticleCategoryImg(list []*models.ArticleListResp, user *models.WxUse
 			v.IsCollect = articleCollectYanxuanSpecialMap[v.ArticleId]
 			v.Pv = yanxuanSpecialPv[v.ArticleId]
 		}
+
+		if v.SubCategoryName == "宏观G2观察" {
+			list[k].Title = "【宏观G2观察】" + v.Title
+		}
 	}
 
 	if len(list) == 0 {