改进Query类分页方法

2026-07-01 12:42:48 +08:00 · 2016-09-26 16:17:36 +08:00
parent fc8f05abc9
commit ddb1d702e9
1 changed files with 4 additions and 2 deletions
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -1009,9 +1009,11 @@ class Query
            $total   = $this->count();
            $bind    = $this->bind;
            $results = $this->options($options)->bind($bind)->page($page, $listRows)->select();
-        } else {
+        } elseif ($simple) {
            $results = $this->limit(($page - 1) * $listRows, $listRows + 1)->select();
-            $total   = isset($total) ? $total : null;
+            $total   = null;
+        } else {
+            $results = $this->page($page, $listRows)->select();
        }
        return $class::make($results, $listRows, $page, $total, $simple, $config);
    }