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

controllers/article.go

@@ -88,7 +88,7 @@ func (this *ArticleController) Detail() {
 	}
 	articleCollectMap, _ := services.GetCygxArticleCollectMap(user.UserId)
 	detail.IsCollect = articleCollectMap[detail.ArticleId]
-	if isSendWx == 0 {
+	if isSendWx == 1 {
 		var condition string
 		var pars []interface{}
 		pars = make([]interface{}, 0)

services/activity.go

@@ -503,6 +503,9 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 	//	havePower = true
 	//}
 	fmt.Println("主客观3", havePower)
+	if !strings.Contains(activityInfo.CustomerTypeIds, userTypeStr) && userTypeStr != "8" {
+		havePower = false
+	}
 	if havePower && activityInfo.LimitPeopleNum > 0 {
 		//对于一些特殊的活动，即使权限满足也不给产看
 		noPower, e := GetShareNoPowe(activityInfo, permissionStr, userType, user)