|
|
@@ -153,7 +153,7 @@ func (this *ArticleController) Detail() {
|
|
|
} else {
|
|
|
hasPermission = 1
|
|
|
hasFree = 1
|
|
|
- var articlePermissionPermissionName string
|
|
|
+ var articlePermissionName string
|
|
|
if detail.CategoryId > 0 {
|
|
|
articlePermission, err := models.GetArticlePermission(detail.CategoryId)
|
|
|
if err != nil {
|
|
|
@@ -166,12 +166,12 @@ func (this *ArticleController) Detail() {
|
|
|
br.ErrMsg = "报告权限不存在，Err:" + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
|
|
|
return
|
|
|
}
|
|
|
- articlePermissionPermissionName = articlePermission.PermissionName
|
|
|
+ articlePermissionName = articlePermission.PermissionName
|
|
|
} else {
|
|
|
- articlePermissionPermissionName = detail.CategoryName
|
|
|
+ articlePermissionName = detail.CategoryName
|
|
|
}
|
|
|
var hasPersion bool
|
|
|
- slice := strings.Split(articlePermissionPermissionName, ",")
|
|
|
+ slice := strings.Split(articlePermissionName, ",")
|
|
|
for _, v := range slice {
|
|
|
if strings.Contains(companyPermission, v) {
|
|
|
hasPersion = true
|
|
|
@@ -211,8 +211,8 @@ func (this *ArticleController) Detail() {
|
|
|
// }
|
|
|
// }
|
|
|
//}
|
|
|
- //大行业通过权限校验，再校验主客观权限
|
|
|
- if hasPersion {
|
|
|
+ //大行业通过权限校验，再校验主客观权限。只有医药、消费、科技、智造，才会校验主客观权限
|
|
|
+ if hasPersion && utils.InArrayByStr([]string{utils.YI_YAO_NAME, utils.XIAO_FEI_NAME, utils.KE_JI_NAME, utils.ZHI_ZAO_NAME}, articlePermissionName) {
|
|
|
hasPersion = services.CheckArticlePermissionType(articleId, user)
|
|
|
}
|
|
|
if !hasPersion {
|
xingzai