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

改进model类

Browse Source
This commit is contained in:
thinkphp
2016-05-08 22:24:40 +08:00
parent cdfe0a5e96
commit 6136572b6e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/Model.php
View File

@@ -599,7 +599,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
{ {
$result = self::with($with)->cache($cache); $result = self::with($with)->cache($cache);
if (is_array($data)) { if (is_array($data)) {
$result = self::db()->where($data); $result = $result->where($data);
$data = [];
} elseif ($data instanceof \Closure) { } elseif ($data instanceof \Closure) {
call_user_func_array($data, [ & $result]); call_user_func_array($data, [ & $result]);
$data = []; $data = [];