Merge branch 'cygx_9.9' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report.go

@@ -2186,7 +2186,17 @@ func (this *ReportController) RoadshowDetail() {
 		} else {
 			hasFree = 1
 			var articlePermissionPermissionName string
-			articlePermissionPermissionName = detail.CategoryName
+			if detail.ArticleId < utils.SummaryArticleId {
+				reportMapDetail, err := models.GetdetailByCategoryIdPush(detail.CategoryId)
+				if err != nil {
+					br.Msg = "获取信息失败"
+					br.ErrMsg = "获取信息失败,Err:" + err.Error()
+					return
+				}
+				articlePermissionPermissionName = reportMapDetail.ChartPermissionName
+			} else {
+				articlePermissionPermissionName = detail.CategoryName
+			}
 			var hasPersion bool
 			slice := strings.Split(articlePermissionPermissionName, ",")
 			for _, v := range slice {

models/report.go

@@ -300,6 +300,7 @@ type ReportDetailRoadshow struct {
 	IsCollect        bool   `description:"是否收藏:true，已收藏，false:未收藏"`
 	IsRoadShow       bool   `description:"是否是路演精华"`
 	VisibleRange     int    `description:"设置可见范围1全部，0内部"`
+	CategoryId       int    `description:"文章分类ID"`
 }
 
 type RoadshowDetailResp struct {