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

调试Model类append方法的追加顺序

Browse Source
This commit is contained in:
thinkphp
2016-07-09 22:16:26 +08:00
parent 3e09d80cde
commit ea1b88af50
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/think/Model.php
View File

@@ -478,11 +478,6 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public function toArray($allow = []) public function toArray($allow = [])
{ {
$item = []; $item = [];
if (!empty($this->append)) {
foreach ($this->append as $name) {
$item[$name] = $this->getAttr($name);
}
}
if (empty($allow)) { if (empty($allow)) {
$allow = array_keys($this->data); $allow = array_keys($this->data);
} }
@@ -508,6 +503,12 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$item[$key] = $this->getAttr($key); $item[$key] = $this->getAttr($key);
} }
} }
// 追加属性（必须定义获取器）
if (!empty($this->append)) {
foreach ($this->append as $name) {
$item[$name] = $this->getAttr($name);
}
}
return !empty($item) ? $item : []; return !empty($item) ? $item : [];
} }