mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正查询范围

Browse Source
This commit is contained in:
thinkphp
2017-04-07 19:20:19 +08:00
parent a05397b341
commit fe39b35206
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/think/Model.php
View File

@@ -1484,7 +1484,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
} }
$model = new static(); $model = new static();
$params = func_get_args(); $params = func_get_args();
$params[0] = $model->db(); $params[0] = $model->getQuery();
if ($name instanceof \Closure) { if ($name instanceof \Closure) {
call_user_func_array($name, $params); call_user_func_array($name, $params);
} elseif (is_string($name)) { } elseif (is_string($name)) {
@@ -1509,8 +1509,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/ */
public static function useGlobalScope($use) public static function useGlobalScope($use)
{ {
$model = new static(); $model = new static();
static::$db = $model->db($use);
return $model; return $model;
} }
@@ -1886,7 +1885,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public static function __callStatic($method, $args) public static function __callStatic($method, $args)
{ {
$model = new static(); $model = new static();
$query = $model->db(); $query = $model->db(true, false);
if (method_exists($model, 'scope' . $method)) { if (method_exists($model, 'scope' . $method)) {
// 动态调用命名范围 // 动态调用命名范围