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

改进

Browse Source
This commit is contained in:
thinkphp
2018-04-12 16:31:54 +08:00
parent 72ff856d27
commit ae442796eb
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/db/Builder.php
View File

@@ -563,6 +563,10 @@ abstract class Builder
*/ */
protected function parseOrder($order, $options = []) protected function parseOrder($order, $options = [])
{ {
if (empty($order)) {
return '';
}
$array = []; $array = [];
foreach ($order as $key => $val) { foreach ($order as $key => $val) {
if ($val instanceof Expression) { if ($val instanceof Expression) {

5
library/think/db/builder/Sqlsrv.php
View File

@@ -35,6 +35,9 @@ class Sqlsrv extends Builder
*/ */
protected function parseOrder($order, $options = []) protected function parseOrder($order, $options = [])
{ {
if (empty($order)) {
return ' ORDER BY rand()';
}
$array = []; $array = [];
foreach ($order as $key => $val) { foreach ($order as $key => $val) {
@@ -55,7 +58,7 @@ class Sqlsrv extends Builder
} }
$order = implode(',', $array); $order = implode(',', $array);
return !empty($order) ? ' ORDER BY ' . $order : ' ORDER BY rand()'; return ' ORDER BY ' . $order;
} }
/** /**