|
|
@@ -323,13 +323,13 @@ func (this *MobileHomeController) NewList() {
|
|
|
//} else {
|
|
|
condition += ` AND is_hide = 0 AND source NOT IN ('activity','activityspecial','newchart','industrialsourceHz','industrialsourceYx') AND IF ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 ) ` + conditionInit
|
|
|
//conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "1,2,3", "", 0, 0, "", 0, 1)
|
|
|
- conditionActivity, err := services.ActivityConditioninitSql(user, "", 0)
|
|
|
+ conditionActivity, err := services.ActivityConditioninitSql(user, " AND art.active_state IN (1,2) ", 0)
|
|
|
if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
br.Msg = "获取失败"
|
|
|
br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- conditionActivity += ` AND art.publish_status = 1 AND art.active_state IN (1,2) `
|
|
|
+ conditionActivity += ` AND art.publish_status = 1 `
|
|
|
var conditionOrder string
|
|
|
conditionOrder = ` ORDER BY art.activity_time DESC , art.active_state ASC `
|
|
|
conditionActivity += conditionOrder
|
