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

services/activity.go

@@ -417,8 +417,15 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 		return
 	}
 	if activityInfo.LimitPeopleNum > 0 {
-		if strings.Contains(permissionStr, activityInfo.ChartPermissionName+"(主观)") {
-			havePower = true
+		mapUserType, e := GetActivityCcustomerTypeList()
+		if e != nil {
+			err = e
+			return
+		}
+		var userTypeStr string
+		userTypeStr = mapUserType[userType]
+		if !strings.Contains(userTypeStr, userTypeStr) {
+			return
 		}
 	}
 	if user.CompanyId <= 1 {