mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 15:12:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Query类分页方法第二个参数支持传入总记录数

Browse Source
This commit is contained in:
thinkphp
2016-09-26 16:07:42 +08:00
parent fb4e38f665
commit fc8f05abc9
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/think/db/Query.php
View File

@@ -972,7 +972,7 @@ class Query
/** /**
* 分页查询 * 分页查询
* @param int|null $listRows 每页数量 * @param int|null $listRows 每页数量
* @param bool $simple 简洁模式 * @param int|bool $simple 简洁模式或者总记录数
* @param array $config 配置参数 * @param array $config 配置参数
* page:当前页, * page:当前页,
* path:url路径, * path:url路径,
@@ -986,6 +986,10 @@ class Query
*/ */
public function paginate($listRows = null, $simple = false, $config = []) public function paginate($listRows = null, $simple = false, $config = [])
{ {
if (is_int($simple)) {
$total = $simple;
$simple = false;
}
$config = array_merge(Config::get('paginate'), $config); $config = array_merge(Config::get('paginate'), $config);
$listRows = $listRows ?: $config['list_rows']; $listRows = $listRows ?: $config['list_rows'];
@@ -1000,16 +1004,15 @@ class Query
$config['path'] = isset($config['path']) ? $config['path'] : call_user_func([$class, 'getCurrentPath']); $config['path'] = isset($config['path']) ? $config['path'] : call_user_func([$class, 'getCurrentPath']);
if (!$simple) { if (!isset($total) && !$simple) {
$options = $this->getOptions(); $options = $this->getOptions();
$total = $this->count(); $total = $this->count();
$bind = $this->bind; $bind = $this->bind;
$results = $this->options($options)->bind($bind)->page($page, $listRows)->select(); $results = $this->options($options)->bind($bind)->page($page, $listRows)->select();
} else { } else {
$results = $this->limit(($page - 1) * $listRows, $listRows + 1)->select(); $results = $this->limit(($page - 1) * $listRows, $listRows + 1)->select();
$total = null; $total = isset($total) ? $total : null;
} }
return $class::make($results, $listRows, $page, $total, $simple, $config); return $class::make($results, $listRows, $page, $total, $simple, $config);
} }