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

改进order用法

Browse Source
This commit is contained in:
thinkphp
2018-04-13 13:21:53 +08:00
parent e4d4911b46
commit 287b390c8f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1503,7 +1503,11 @@ class Query
if (!empty($this->options['via'])) { if (!empty($this->options['via'])) {
$field = $this->options['via'] . '.' . $field; $field = $this->options['via'] . '.' . $field;
} }
$field = empty($order) ? $field : [$field => $order]; if (strpos($field, ',')) {
$field = array_map('trim', explode(',', $field));
} else {
$field = empty($order) ? $field : [$field => $order];
}
} elseif (!empty($this->options['via'])) { } elseif (!empty($this->options['via'])) {
foreach ($field as $key => $val) { foreach ($field as $key => $val) {
if (is_numeric($key)) { if (is_numeric($key)) {