mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-08-30 12:45:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

调整HasMany类的has和hasWhere方法，取消第一个参数

Browse Source
This commit is contained in:
thinkphp
2017-01-16 17:36:15 +08:00
parent 04c81ca6b5
commit ff4be602c0
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Model.php
View File

@@ -1237,9 +1237,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
{
$model = new static();
if (is_array($operator) || $operator instanceof \Closure) {
return $model->$relation()->hasWhere($model, $operator);
return $model->$relation()->hasWhere($operator);
}
return $model->$relation()->has($model, $operator, $count, $id);
return $model->$relation()->has($operator, $count, $id);
}
/**
@@ -1252,7 +1252,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public static function hasWhere($relation, $where = [])
{
$model = new static();
return $model->$relation()->hasWhere($model, $where);
return $model->$relation()->hasWhere($where);
}
/**