Merge branch 'cygx_12.0' into debug

controllers/yanxuan_special.go

@@ -41,7 +41,7 @@ func (this *YanxuanSpecialController) List() {
 		pars = append(pars, userId)
 	}
 
-	specialUser, err = models.GetYanxuanSpecialAuthor(sysUser.UserId)
+	specialUser, err = models.GetYanxuanSpecialAuthor(sysUser.UserId,sysUser.UserId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败, Err:" + err.Error()
@@ -309,7 +309,7 @@ func (this *YanxuanSpecialController) AuthorDetail() {
 	if userId == 0 {
 		userId = sysUser.UserId
 	}
-	item, tmpErr := models.GetYanxuanSpecialAuthor(userId)
+	item, tmpErr := models.GetYanxuanSpecialAuthor(userId, sysUser.UserId)
 	if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败, Err:" + tmpErr.Error()
@@ -771,7 +771,7 @@ func (this *YanxuanSpecialController) AuthorList() {
 	var specialUser *models.CygxYanxuanSpecialAuthorItem
 	var err error
 
-	specialUser, err = models.GetYanxuanSpecialAuthor(sysUser.UserId)
+	specialUser, err = models.GetYanxuanSpecialAuthor(sysUser.UserId,sysUser.UserId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败, Err:" + err.Error()

models/cygx_yanxuan_special_user.go

@@ -39,6 +39,7 @@ type CygxYanxuanSpecialAuthorItem struct {
 	CollectNum        int    // 被收藏数
 	FollowNum         int    // 被关注数
 	SpecialArticleNum int    // 文章数
+	IsFollow          int    // 是否已关注 1已关注 0 未关注
 }
 
 func AddCygxYanxuanSpecialAuthor(item *CygxYanxuanSpecialAuthor) (lastId int64, err error) {
@@ -61,19 +62,20 @@ func EnableYanxuanSpecialAuthor(userId, status int) (err error) {
 	return
 }
 
-func GetYanxuanSpecialAuthor(userId int) (item *CygxYanxuanSpecialAuthorItem, err error) {
+func GetYanxuanSpecialAuthor(reqUserId, sysUserId int) (item *CygxYanxuanSpecialAuthorItem, err error) {
 	o := orm.NewOrm()
 	sql := ``
 	sql = `SELECT
 	a.*,c.company_name,
 	( SELECT count( 1 ) FROM cygx_yanxuan_special_collect AS ac  INNER JOIN cygx_yanxuan_special as cs ON  ac.yanxuan_special_id = cs.id  WHERE cs.user_id = a.user_id  ) AS collect_num,
 	( SELECT count( 1 ) FROM cygx_yanxuan_special_follow AS cf  WHERE cf.follow_user_id = a.user_id  ) AS follow_num,
-	( SELECT count( 1 ) FROM cygx_yanxuan_special AS ca  WHERE ca.user_id = a.user_id  ) AS special_article_num 
+	( SELECT count( 1 ) FROM cygx_yanxuan_special AS ca  WHERE ca.user_id = a.user_id  ) AS special_article_num,
+	( SELECT count( 1 ) FROM cygx_yanxuan_special_follow AS cf  WHERE cf.follow_user_id =? AND cf.user_id = ?  ) AS is_follow 
 FROM
 	cygx_yanxuan_special_author as a
 	INNER JOIN wx_user AS u ON u.user_id = a.user_id
 	INNER JOIN company AS c ON c.company_id = u.company_id WHERE a.user_id=? `
-	err = o.Raw(sql, userId).QueryRow(&item)
+	err = o.Raw(sql, reqUserId, sysUserId, reqUserId).QueryRow(&item)
 	return
 }
 
@@ -95,7 +97,6 @@ func UpdateYanxuanSpecialAuthor(item *CygxYanxuanSpecialAuthor) (err error) {
 	return
 }
 
-
 func GetYanxuanSpecialAuthorList() (items []*CygxYanxuanSpecialAuthorItem, err error) {
 	o := orm.NewOrm()
 	sql := ``
@@ -112,4 +113,4 @@ FROM
 type SpecialAuthorListResp struct {
 	List     []*CygxYanxuanSpecialAuthorItem
 	IsAuthor bool
-}
+}