From ea2020cbbf74d28b79f281d5ba7f5cf5955180cd Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 7 Apr 2017 19:29:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Model.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/library/think/Model.php b/library/think/Model.php
index 86c874bc..08b967df 100644
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -1475,16 +1475,17 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      * @access public
      * @param string|array|\Closure $name 命名范围名称 逗号分隔
      * @internal  mixed                 ...$params 参数调用
-     * @return Model|Query
+     * @return Query
      */
     public static function scope($name)
     {
         if ($name instanceof Query) {
             return $name;
         }
-        $model     = new static();
-        $params    = func_get_args();
-        $params[0] = $model->getQuery();
+        $model  = new static();
+        $query  = $model->db();
+        $params = func_get_args();
+        array_unshift($params, $query);
         if ($name instanceof \Closure) {
             call_user_func_array($name, $params);
         } elseif (is_string($name)) {
@@ -1498,7 +1499,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
                 }
             }
         }
-        return $model;
+        return $query;
     }
 
     /**
@@ -1885,7 +1886,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
     public static function __callStatic($method, $args)
     {
         $model = new static();
-        $query = $model->db(true, false);
+        $query = $model->db();
 
         if (method_exists($model, 'scope' . $method)) {
             // 动态调用命名范围