xingzai il y a 3 ans
Parent
commit
e306e8491f
1 fichiers modifiés avec 17 ajouts et 11 suppressions
  1. 17 11
      controllers/tactics.go

+ 17 - 11
controllers/tactics.go

@@ -184,18 +184,24 @@ func (this *TacticsController) Detail() {
 			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) {
 				hasPermission = 1
 				historyRecord := new(models.CygxArticleHistoryRecord)
 				historyRecord.UserId = uid