|
@@ -514,18 +514,25 @@ func (this *ArticleController) AddStopTime() {
|
|
|
goto Loop
|
|
|
} else {
|
|
|
hasFree = 1
|
|
|
- articlePermission, err := models.GetArticlePermission(detail.CategoryId)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取信息失败"
|
|
|
- br.ErrMsg = "获取报告权限失败,Err:" + err.Error() + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
|
|
|
- return
|
|
|
- }
|
|
|
- if articlePermission == nil {
|
|
|
- br.Msg = "获取信息失败"
|
|
|
- br.ErrMsg = "报告权限不存在,Err:" + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
|
|
|
- return
|
|
|
+ var articlePermissionPermissionName string
|
|
|
+ if detail.CategoryId > 0 {
|
|
|
+ articlePermission, err := models.GetArticlePermission(detail.CategoryId)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "获取报告权限失败,Err:" + err.Error() + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if articlePermission == nil {
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "报告权限不存在,Err:" + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ articlePermissionPermissionName = articlePermission.PermissionName
|
|
|
+ } else {
|
|
|
+ articlePermissionPermissionName = detail.CategoryName
|
|
|
}
|
|
|
- if strings.Contains(companyPermission, articlePermission.PermissionName) {
|
|
|
+
|
|
|
+ if strings.Contains(companyPermission, articlePermissionPermissionName) {
|
|
|
detailNew, err := models.GetNewArticleHistoryRecord(uid, articleId)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取信息失败"
|