|
@@ -173,10 +173,10 @@ func (this *ActivityCoAntroller) ActivityList() {
|
|
|
//permissionSqlStr = strings.TrimRight(permissionSqlStr, ",")
|
|
|
//permissionSqlStr = ` AND art.chart_permission_name IN (` + permissionSqlStr + `)`
|
|
|
sqlExport = ` AND (art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%' `
|
|
|
- if userType == 1 || userType == 2 {
|
|
|
+ if userType == 2 {
|
|
|
sqlExport += ` OR art.customer_type_ids LIKE '%3%' `
|
|
|
}
|
|
|
- if (userType == 1 || userType == 2 || userType == 3) && strings.Contains(permissionStr, "专家") {
|
|
|
+ if (userType == 2 || userType == 3) && strings.Contains(permissionStr, "专家") {
|
|
|
sqlExport += ` OR art.customer_type_ids LIKE '%4%' `
|
|
|
}
|
|
|
sqlExport += `) `
|
|
@@ -222,7 +222,7 @@ func (this *ActivityCoAntroller) ActivityList() {
|
|
|
}
|
|
|
condition += ` AND art.publish_status = 1 `
|
|
|
var conditionOr string
|
|
|
- if strings.Contains(permissionStr, "专家") && (userType == 1 || userType == 2 || userType == 3 || userType == 4) {
|
|
|
+ if strings.Contains(permissionStr, "专家") && (userType == 2 || userType == 3 || userType == 4) {
|
|
|
conditionOr = ` OR ( art.is_limit_people = 0 AND art.activity_type_id IN ( 1,3 ) ` + condition + `) `
|
|
|
conditionOr += ` OR ( art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%' ` + condition + `) `
|
|
|
}
|