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

改进Model类的useGlobalScope方法

Browse Source
This commit is contained in:
thinkphp
2016-12-06 07:52:47 +08:00
parent 47ad3507d5
commit 57fe06a11b
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
library/think/Model.php
View File

@@ -113,6 +113,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
protected $batchValidate = false; protected $batchValidate = false;
// 查询数据集对象 // 查询数据集对象
protected $resultSetType; protected $resultSetType;
//
protected static $db;
/** /**
* 初始化过的模型. * 初始化过的模型.
@@ -1149,8 +1151,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/ */
public static function useGlobalScope($use) public static function useGlobalScope($use)
{ {
$model = new static(); $model = new static();
$model->useGlobalScope = $use; self::$db = $model->db($use);
return $model; return $model;
} }
@@ -1433,7 +1435,12 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public static function __callStatic($method, $params) public static function __callStatic($method, $params)
{ {
$query = (new static())->db(); if (isset(static::$db)) {
$query = static::$db;
} else {
$query = (new static())->db();
}
return call_user_func_array([$query, $method], $params); return call_user_func_array([$query, $method], $params);
} }