From aa0583fee48c2b02f204a5377f9e538edb269257 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 31 Aug 2017 15:58:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BQuery=E7=B1=BBchunk=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E9=81=BF=E5=85=8D=E5=8F=97order=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/Query.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/think/db/Query.php b/library/think/db/Query.php
index 64f449c9..f19cdc2e 100644
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -2581,8 +2581,11 @@ class Query
         if (is_array($column)) {
             $column = $column[0];
         }
+        if (isset($options['order'])) {
+            unset($options['order']);
+        }
         $bind      = $this->bind;
-        $resultSet = $this->limit($count)->order($column, $order)->select();
+        $resultSet = $this->options($options)->limit($count)->order($column, $order)->select();
         if (strpos($column, '.')) {
             list($alias, $key) = explode('.', $column);
         } else {