From a3f80621b556995789870b03df3e7fd8d8017c2c Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 25 Oct 2016 22:54:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BQuery=E7=B1=BB=E7=9A=84pagina?=
 =?UTF-8?q?te=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/db/Query.php b/library/think/db/Query.php
index c78b17c1..796dd769 100644
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -1002,6 +1002,9 @@ class Query
 
         if (!isset($total) && !$simple) {
             $options = $this->getOptions();
+            if (isset($options['order'])) {
+                unset($this->options['order']);
+            }
             $bind    = $this->bind;
             $total   = $this->count();
             $results = $this->options($options)->bind($bind)->page($page, $listRows)->select();