改进对Page的解析位置

2026-07-01 20:52:48 +08:00 · 2016-04-26 08:25:31 +08:00
parent 94c1ffb986
commit 67c47dd526
2 changed files with 9 additions and 8 deletions
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -1455,6 +1455,15 @@ class Query
            }
        }

+        if (isset($options['page'])) {
+            // 根据页数计算limit
+            list($page, $listRows) = $options['page'];
+            $page                  = $page > 0 ? $page : 1;
+            $listRows              = $listRows > 0 ? $listRows : (is_numeric($options['limit']) ? $options['limit'] : 20);
+            $offset                = $listRows * ($page - 1);
+            $options['limit']      = $offset . ',' . $listRows;
+        }
+
        $this->options = [];
        return $options;
    }