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

Query类的order方法支持多次调用合并

Browse Source
This commit is contained in:
thinkphp
2016-12-23 14:47:28 +08:00
parent c33cc2991b
commit 2c03514d98
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1181,7 +1181,14 @@ class Query
} }
} }
} }
$this->options['order'] = $field; if (!isset($this->options['order'])) {
$this->options['order'] = [];
}
if (is_array($field)) {
$this->options['order'] = array_merge($this->options['order'], $field);
} else {
$this->options['order'][] = $field;
}
} }
return $this; return $this;
} }