|
@@ -616,8 +616,8 @@ func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower
|
|
|
sqlExport += `) `
|
|
|
|
|
|
if isPower == 1 {
|
|
|
- permissionSqlStr = ` AND art.chart_permission_name IN (` + permissionNameStr + `)`
|
|
|
- condition += permissionSqlStr
|
|
|
+ //permissionSqlStr = ` AND art.chart_permission_name IN (` + permissionNameStr + `)`
|
|
|
+ //condition += permissionSqlStr
|
|
|
}
|
|
|
|
|
|
var conditionOr string
|
|
@@ -653,9 +653,9 @@ func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if userType == 3 {
|
|
|
- condition += ` AND art.chart_permission_name IN (` + permissionNameStrZhengShi + `) `
|
|
|
- }
|
|
|
+ //if userType == 3 {
|
|
|
+ // condition += ` AND art.chart_permission_name IN (` + permissionNameStrZhengShi + `) `
|
|
|
+ //}
|
|
|
condition += ` AND art.is_limit_people = 1 `
|
|
|
conditionActivity = condition + permissionSqlStr + sqlExport + conditionOr
|
|
|
return
|