弘则下面的客户对活动可见不受限制

services/activity.go

@@ -466,7 +466,8 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 	permissionNameStr = strings.TrimRight(permissionNameStr, ",")
 	var condition string
 	var conditionAdmin string
-	var sqlExport string // 专家权限处理
+	var conditionHz string // 弘则权限处理
+	var sqlExport string   // 专家权限处理
 	permissionSqlStr = `  AND art.chart_permission_name  IN (` + permissionNameStr + `)`
 	sqlExport = ` AND (art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%' `
 	if userType == 2 {
@@ -484,10 +485,7 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 			condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.activity_type_id = ` + activityTypeId
 		}
 	}
-	//活动仅决策人可见
-	if isMaker == 0 {
-		condition += ` AND art.is_maker_show = 0  `
-	}
+
 	//主题
 	if label != "" {
 		condition = ` AND art.label  LIKE '%` + label + `%' `
@@ -540,8 +538,16 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 	}
 
 	//查询全部可见的数据（是否全部客户可见）
-	condition += ` AND art.visible_range != 1  AND art.publish_status = 1 `
+	//condition += ` AND art.visible_range != 1  AND art.publish_status = 1 `
+	condition += `   AND art.publish_status = 1 `
+	conditionHz = condition
 
+	//活动仅决策人可见
+	if isMaker == 0 {
+		condition += ` AND art.is_maker_show = 0  `
+	}
+	conditionAdmin = condition + `  AND art.visible_range = 1 `
+	condition += `  AND art.visible_range != 1 `
 	if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
 		conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
 	}
@@ -561,7 +567,7 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 			conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
 		}
 	}
-	conditionAdmin = condition
+
 	if adminIds != "" {
 		conditionOr += ` OR (  art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%' ` + ` AND  art.admin_id IN (` + adminIds + `) ` + conditionAdmin + `) `
 		if companyProduct != nil {
@@ -571,6 +577,11 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 		}
 	}
 
+	//弘则研究下的客户不做权限，限制
+	if user.CompanyId == 16 {
+		conditionOr += ` OR (  art.publish_status = 1 ` + conditionHz + `) `
+	}
+
 	conditionActivity = condition + permissionSqlStr + sqlExport + conditionOr
 	return
 }