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

修正toarray方法

Browse Source
This commit is contained in:
thinkphp
2017-04-14 18:10:10 +08:00
parent 35d57cfb5c
commit f55e7ae900
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/think/Model.php
View File

@@ -739,13 +739,16 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$item = []; $item = [];
$visible = []; $visible = [];
$hidden = []; $hidden = [];
$data = array_merge($this->data, $this->relation);
// 过滤属性 // 过滤属性
if (!empty($this->visible)) { if (!empty($this->visible)) {
$array = $this->parseAttr($this->visible, $visible); $array = $this->parseAttr($this->visible, $visible);
$data = array_intersect_key($this->data, array_flip($array)); $data = array_intersect_key($data, array_flip($array));
} elseif (!empty($this->hidden)) { } elseif (!empty($this->hidden)) {
$array = $this->parseAttr($this->hidden, $hidden, false); $array = $this->parseAttr($this->hidden, $hidden, false);
$data = array_diff_key($this->data, array_flip($array)); $data = array_diff_key($data, array_flip($array));
} else { } else {
$data = $this->data; $data = $this->data;
} }