From 7af500de84bdb3cc17c67530b54b7fe1ac62d396 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 7 Oct 2016 11:28:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Query=E7=B1=BBparseOrder?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=B8=80=E5=A4=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/Builder.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/library/think/db/Builder.php b/library/think/db/Builder.php
index 75c4aa86..f38e20bc 100644
--- a/library/think/db/Builder.php
+++ b/library/think/db/Builder.php
@@ -452,9 +452,10 @@ abstract class Builder
      * order分析
      * @access protected
      * @param mixed $order
+     * @param array $options 查询条件
      * @return string
      */
-    protected function parseOrder($order)
+    protected function parseOrder($order, $options = [])
     {
         if (is_array($order)) {
             $array = [];
@@ -590,7 +591,7 @@ abstract class Builder
                 $this->parseWhere($options['where'], $options),
                 $this->parseGroup($options['group']),
                 $this->parseHaving($options['having']),
-                $this->parseOrder($options['order']),
+                $this->parseOrder($options['order'], $options),
                 $this->parseLimit($options['limit']),
                 $this->parseUnion($options['union']),
                 $this->parseLock($options['lock']),
@@ -721,7 +722,7 @@ abstract class Builder
                 implode(',', $set),
                 $this->parseJoin($options['join'], $options),
                 $this->parseWhere($options['where'], $options),
-                $this->parseOrder($options['order']),
+                $this->parseOrder($options['order'], $options),
                 $this->parseLimit($options['limit']),
                 $this->parseLock($options['lock']),
                 $this->parseComment($options['comment']),
@@ -745,7 +746,7 @@ abstract class Builder
                 !empty($options['using']) ? ' USING ' . $this->parseTable($options['using'], $options) . ' ' : '',
                 $this->parseJoin($options['join'], $options),
                 $this->parseWhere($options['where'], $options),
-                $this->parseOrder($options['order']),
+                $this->parseOrder($options['order'], $options),
                 $this->parseLimit($options['limit']),
                 $this->parseLock($options['lock']),
                 $this->parseComment($options['comment']),