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

改进Query类paginate方法第一个参数可以使用数组参数

Browse Source
This commit is contained in:
thinkphp
2017-01-11 22:35:02 +08:00
parent 214ed4976c
commit 48064414c4
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1115,9 +1115,9 @@ class Query
/** /**
* 分页查询 * 分页查询
* @param int|null $listRows 每页数量 * @param int|array $listRows 每页数量 数组表示配置参数
* @param int|bool $simple 简洁模式或者总记录数 * @param int|bool $simple 是否简洁模式或者总记录数
* @param array $config 配置参数 * @param array $config 配置参数
* page:当前页, * page:当前页,
* path:url路径, * path:url路径,
* query:url额外参数, * query:url额外参数,
@@ -1134,8 +1134,13 @@ class Query
$total = $simple; $total = $simple;
$simple = false; $simple = false;
} }
$config = array_merge(Config::get('paginate'), $config); if (is_array($listRows)) {
$listRows = $listRows ?: $config['list_rows']; $config = array_merge(Config::get('paginate'), $listRows);
$listRows = $config['list_rows'];
} else {
$config = array_merge(Config::get('paginate'), $config);
$listRows = $listRows ?: $config['list_rows'];
}
/** @var Paginator $class */ /** @var Paginator $class */
$class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\paginator\\driver\\' . ucwords($config['type']); $class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\paginator\\driver\\' . ucwords($config['type']);