浏览代码

Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

xingzai 2 年之前
父节点
当前提交
29d38f7601
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      controllers/activity.go

+ 1 - 1
controllers/activity.go

@@ -280,7 +280,7 @@ func (this *ActivityCoAntroller) ActivityList() {
 	}
 
 	condition += ` AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr
-	total, err := models.GetActivityCount(condition, playBack, pars)
+	total, err := models.GetActivityCount(condition, playBack, pars, 0)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败,Err:" + err.Error()