Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_clpt into cygx_10.7

services/activity.go

@@ -1025,17 +1025,20 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 		havePower = true
 		return
 	}
-	if activityInfo.ActivityTypeId == 2 || activityInfo.ActivityTypeId == 6 || activityInfo.ActivityTypeId == 7 {
-		if strings.Contains(permissionStr, activityInfo.ChartPermissionName+"(主观)") {
-			havePower = true
-		} else {
-			havePower = false
-		}
-	} else {
-		if strings.Contains(permissionStr, activityInfo.ChartPermissionName+"(客观)") {
-			havePower = true
+	//医药消费，科技，智造四大行业，验证主客观。如果主客观校验不通过，那么直接返回
+	if strings.Contains(utils.YI_YAO_NAME+utils.XIAO_FEI_NAME+utils.KE_JI_NAME+utils.ZHI_ZAO_NAME, activityInfo.ChartPermissionName) {
+		if activityInfo.ActivityTypeId == 2 || activityInfo.ActivityTypeId == 6 || activityInfo.ActivityTypeId == 7 {
+			if strings.Contains(permissionStr, activityInfo.ChartPermissionName+"(主观)") {
+				havePower = true
+			} else {
+				havePower = false
+			}
 		} else {
-			havePower = false
+			if strings.Contains(permissionStr, activityInfo.ChartPermissionName+"(客观)") {
+				havePower = true
+			} else {
+				havePower = false
+			}
 		}
 	}
 	//如果主客观校验不通过，那么直接返回