Merge branch 'CRM_14.5' into debug

models/wx_user.go

@@ -595,7 +595,7 @@ func SetUserFollow(userId, follow int) (err error) {
 
 func GetCompanyFollowCount(companyId int) (count int, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT COUNT(1) FROM wx_user WHERE company_id=? `
+	sql := ` SELECT COUNT(1) FROM wx_user WHERE company_id=? AND is_follow = 1 `
 	err = o.Raw(sql, companyId).QueryRow(&count)
 	return
 }