|
@@ -451,9 +451,10 @@ func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower
|
|
|
conditionOr += ` OR ( art.is_limit_people = 1 AND ` + conditionHangYe + condition + ` ) `
|
|
conditionOr += ` OR ( art.is_limit_people = 1 AND ` + conditionHangYe + condition + ` ) `
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- 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 `
|
|
condition += ` AND art.is_limit_people = 1 `
|
|
|
conditionActivity = condition + permissionSqlStr + sqlExport + conditionOr
|
|
conditionActivity = condition + permissionSqlStr + sqlExport + conditionOr
|
|
|
return
|
|
return
|
|
@@ -1893,8 +1894,8 @@ func GetYanxuanActivityIds(user *models.WxUserItem, activeState int) (activityId
|
|
|
var pars []interface{}
|
|
var pars []interface{}
|
|
|
condition = ` AND chart_permission_id = 31 AND yidong_activity_id = '' AND art.publish_status = 1 `
|
|
condition = ` AND chart_permission_id = 31 AND yidong_activity_id = '' AND art.publish_status = 1 `
|
|
|
if activeState > 0 {
|
|
if activeState > 0 {
|
|
|
- condition += ` AND active_state = ? `
|
|
|
|
|
- pars = append(pars, activeState)
|
|
|
|
|
|
|
+ condition += ` AND active_state = ` + strconv.Itoa(activeState)
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
//pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
|
|
//pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
|
|
|
if user.CompanyId > 1 {
|
|
if user.CompanyId > 1 {
|
xingzai