no message

controllers/article.go

@@ -220,6 +220,7 @@ func (this *ArticleController) Detail() {
 			goto Loop
 		} else {
 			var articlePermissionName string
+			var matchTypeName string //查研观向这边的匹配类型
 			if detail.CategoryId > 0 {
 				articlePermission, err := models.GetArticlePermission(detail.CategoryId)
 				if err != nil {
@@ -233,6 +234,7 @@ func (this *ArticleController) Detail() {
 					return
 				}
 				articlePermissionName = articlePermission.PermissionName
+				matchTypeName = articlePermission.MatchTypeName
 			} else {
 				articlePermissionName = detail.CategoryName
 			}
@@ -282,8 +284,8 @@ func (this *ArticleController) Detail() {
 			//}
 			//}
 
-			//大行业通过权限校验，再校验主客观权限。只有医药、消费、科技、智造，才会校验主客观权限
-			if hasPersion && utils.InArrayByStr([]string{utils.YI_YAO_NAME, utils.XIAO_FEI_NAME, utils.KE_JI_NAME, utils.ZHI_ZAO_NAME}, articlePermissionName) {
+			//大行业通过权限校验，再校验主客观权限。只有医药、消费、科技、智造，才会校验主客观权限，热点问答这个匹配类型下的所有报告，也不做主客观校验
+			if 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

@@ -229,10 +229,10 @@ func GetArticleDetailByIdStr(articleIdStr string) (items []*ArticleDetail, err e
 	return
 }
 
-func GetArticlePermission(companyId int) (item *ChartPermission, err error) {
+func GetArticlePermission(companyId int) (item *ChartPermissionItemResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-			a.chart_permission_name as  permission_name
+			a.chart_permission_name as  permission_name,a.match_type_name
 			FROM
 			cygx_report_mapping AS a
 			WHERE

models/chart_permission.go

@@ -13,6 +13,15 @@ type ChartPermission struct {
 	IsChoose          bool   `description:"是否选择"`
 }
 
+type ChartPermissionItemResp struct {
+	ChartPermissionId int    `description:"权限id"`
+	PermissionName    string `description:"权限名称"`
+	IsShowSustainable bool   `description:"是否展示限免标签"`
+	ImageUrlM         string `description:"图片地址"`
+	IsChoose          bool   `description:"是否选择"`
+	MatchTypeName     string `description:"匹配类型名称"`
+}
+
 type ActivityChartPermission struct {
 	ChartPermissionId int    `description:"权限id"`
 	PermissionName    string `description:"权限名称"`