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

Model类的useGlobalScope 属性改为动态属性 全局查询范围方法base改为动态方法 软删除属性 deleteTime属性改为动态属性，并且没有定义的话默认为delete_time 取消tableAlias属性定义 直接可以在deleteTime属性里面定义别名.字段名

Browse Source
This commit is contained in:
thinkphp
2016-09-30 18:14:57 +08:00
parent cf4415e9d9
commit a0b1a75d92
2 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
library/think/Model.php
View File

@@ -100,7 +100,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
// 验证失败是否抛出异常
protected $failException = false;
// 全局查询范围
protected static $useGlobalScope = true;
protected $useGlobalScope = true;
/**
* 初始化过的模型.
@@ -1116,8 +1116,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/
public static function useGlobalScope($use)
{
$model = new static();
static::$useGlobalScope = $use;
$model = new static();
$model->useGlobalScope = $use;
return $model;
}
@@ -1341,8 +1341,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
{
$query = $this->db();
// 全局作用域
if (static::$useGlobalScope && method_exists($this, 'base')) {
call_user_func_array('static::base', [ & $query]);
if ($this->useGlobalScope && method_exists($this, 'base')) {
call_user_func_array([$this, 'base'], [ & $query]);
}
if (method_exists($this, 'scope' . $method)) {
// 动态调用命名范围
@@ -1358,10 +1358,10 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public static function __callStatic($method, $params)
{
$query = self::getDb();
$model = get_called_class();
$model = new static();
// 全局作用域
if (static::$useGlobalScope && method_exists($model, 'base')) {
call_user_func_array('static::base', [ & $query]);
if ($model->useGlobalScope && method_exists($model, 'base')) {
call_user_func_array([$model, 'base'], [ & $query]);
}
return call_user_func_array([$query, $method], $params);
}