no message

services/activity.go

@@ -821,30 +821,30 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 	//	}
 	//}
 
-	//if userType != 2 {
-	// 8： 行业升级套餐客户：该活动对应行业为升级权限的客户
-	permissionShengji, errs := models.GetCompanyPermissionByUserZhengShiTrip(user.CompanyId)
-	if errs != nil {
-		err = errs
-		return
-	}
-	if permissionShengji != "" {
-		slicePerShengji := strings.Split(permissionShengji, ",")
-		permissionShengji = ""
-		for _, v := range slicePerShengji {
-			if userType == 1 {
-				//研选权限处理(永续客户无法查看研选)
-				if !strings.Contains(v, utils.CHART_PERMISSION_NAME_YANXUAN) {
+	if userType != 2 {
+		// 8： 行业升级套餐客户：该活动对应行业为升级权限的客户
+		permissionShengji, errs := models.GetCompanyPermissionByUserZhengShiTrip(user.CompanyId)
+		if errs != nil {
+			err = errs
+			return
+		}
+		if permissionShengji != "" {
+			slicePerShengji := strings.Split(permissionShengji, ",")
+			permissionShengji = ""
+			for _, v := range slicePerShengji {
+				if userType == 1 {
+					//研选权限处理(永续客户无法查看研选)
+					if !strings.Contains(v, utils.CHART_PERMISSION_NAME_YANXUAN) {
+						permissionShengji += "'" + v + "',"
+					}
+				} else {
 					permissionShengji += "'" + v + "',"
 				}
-			} else {
-				permissionShengji += "'" + v + "',"
 			}
+			permissionShengji = strings.TrimRight(permissionShengji, ",")
+			conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%8%'	   AND art.chart_permission_name  IN (` + permissionShengji + `)` + condition + `) `
 		}
-		permissionShengji = strings.TrimRight(permissionShengji, ",")
-		conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%8%'	   AND art.chart_permission_name  IN (` + permissionShengji + `)` + condition + `) `
 	}
-	//}
 
 	conditionHz = condition
 	//活动仅决策人可见