Merge branch 'cygx_9.7' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -497,7 +497,7 @@ func (this *ActivityCoAntroller) Detail() {
 		}
 		activityInfo.SignupType = mapActivitySignup[activityId]
 		//判断是不是通过微信模版推送消息进来的
-		if isSendWx == 1 && len(industrialList) > 0 {
+		if isSendWx == 0 && len(industrialList) > 0 {
 			industryUserFollowMap, err := services.GetIndustryUserFollowMap(user)
 			if err != nil {
 				br.Msg = "获取信息失败"
@@ -511,7 +511,6 @@ func (this *ActivityCoAntroller) Detail() {
 			}
 			activityInfo.IsShowFollowButton = true
 		}
-		activityInfo.IsShowFollowButton = true
 		if activityInfo.ReportLink != "" {
 			artList, err := services.GetActivityReportLinkToArticleList(activityInfo)
 			if err != nil && err.Error() != utils.ErrNoRow() {

controllers/article.go

@@ -82,8 +82,7 @@ func (this *ArticleController) Detail() {
 		br.ErrMsg = "获取信息失败,Err:" + err.Error()
 		return
 	}
-	detail.IsShowFollowButton = true
-	if isSendWx == 1 {
+	if isSendWx == 0 {
 		var condition string
 		var pars []interface{}
 		pars = make([]interface{}, 0)

controllers/report.go

@@ -435,7 +435,7 @@ func (this *ReportController) ArticleCategoryList() {
 	if videoSimple.Id > 0 {
 		resp.IndustryVideo = videoSimple
 	}
-	if isSendWx == 1 {
+	if isSendWx == 0 {
 		industryUserFollowMap, err := services.GetIndustryUserFollowMap(user)
 		if err != nil {
 			br.Msg = "获取信息失败"
@@ -445,7 +445,6 @@ func (this *ReportController) ArticleCategoryList() {
 		resp.IsFollowButton = industryUserFollowMap[industrialManagementId]
 		resp.IsShowFollowButton = true
 	}
-	resp.IsShowFollowButton = true
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"