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

controllers/yanxuan_special.go

@@ -244,6 +244,18 @@ func (this *YanxuanSpecialController) Detail() {
 		resp.Content = services.AnnotationHtml(resp.Content)
 	}
 
+	if sysUser.UserId > 0 {
+		followCount, err := models.GetCygxYanxuanSpecialFollowCountByUser(sysUser.UserId, item.UserId)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取失败, Err:" + err.Error()
+			return
+		}
+		if followCount == 1 {
+			resp.IsFollowAuthor = true
+		}
+	}
+
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true

models/cygx_yanxuan_special.go

@@ -61,12 +61,13 @@ type CygxYanxuanSpecialItem struct {
 
 type CygxYanxuanSpecialResp struct {
 	CygxYanxuanSpecialItem
-	Docs          []Doc
-	CompanyTags   []string
-	IndustryTags  []string
-	HasPermission int  `description:"1:正常展示，2：不展示"`
-	ExamineStatus int  `description:"1:未发布，2:审核中 3:已发布 4:驳回"`
-	IsShowExamine bool `description:"是否展示审核状态按钮"`
+	Docs           []Doc
+	CompanyTags    []string
+	IndustryTags   []string
+	HasPermission  int  `description:"1:正常展示，2：不展示"`
+	ExamineStatus  int  `description:"1:未发布，2:审核中 3:已发布 4:驳回"`
+	IsShowExamine  bool `description:"是否展示审核状态按钮"`
+	IsFollowAuthor bool // 是否已关注专栏
 }
 
 type CygxYanxuanSpecialCenterResp struct {

models/cygx_yanxuan_special_follow.go

@@ -66,3 +66,11 @@ func GetCygxYanxuanSpecialFollowCount(condition string, pars []interface{}) (cou
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
+
+// 获取数量判断用户是否关注专栏
+func GetCygxYanxuanSpecialFollowCountByUser(userId, followUserId int) (count int, err error) {
+	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_yanxuan_special_follow as a WHERE user_id=? AND follow_user_id=? `
+	o := orm.NewOrm()
+	err = o.Raw(sqlCount, userId, followUserId).QueryRow(&count)
+	return
+}