Merge branch 'cygx_need_p1_812' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/article.go

@@ -272,7 +272,12 @@ func (this *ArticleController) Detail() {
 			//	}
 			//}
 			//}
-			hasPersion = services.CheckArticlePermissionType(articleId, user)
+
+			//大行业通过权限校验，再校验主客观权限
+			if hasPersion {
+				hasPersion = services.CheckArticlePermissionType(articleId, user)
+			}
+
 			if hasPersion {
 				hasPermission = 1
 				go services.ArticleHistory(articleId, user)