Merge branch 'master' of https://github.com/top-think/framework

2026-07-01 20:52:48 +08:00 · 2016-09-13 11:02:53 +08:00
parent acbd5b97fe ab1fc037a5
commit 6e96a6aac6
1 changed files with 2 additions and 0 deletions
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -1067,6 +1067,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
        } elseif ($data instanceof \Closure) {
            call_user_func_array($data, [ & $query]);
            $data = null;
+        } elseif (is_null($data)) {
+            return 0;
        }
        $resultSet = $query->select($data);
        $count     = 0;