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

优化

Browse Source
This commit is contained in:
thinkphp
2016-04-08 14:42:23 +08:00
parent f3a0c1f77e
commit b2a592f94d
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/think/Model.php
View File

@@ -126,15 +126,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
/** /**
* 转换为数组 * 转换为数组
* @access public * @access public
* @return Model * @return array
*/ */
public function toArray() public function toArray()
{ {
if (!empty($this->data)) { return !empty($this->data) ? $this->data : [];
return $this->data;
} else {
return [];
}
} }
/** /**
@@ -179,12 +175,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
} }
// 标记字段更改 // 标记字段更改
if (!isset($this->data[$name]) || (isset($this->data[$name]) && $this->data[$name] != $value && !in_array($name, $this->change))) { if (!isset($this->data[$name]) || ($this->data[$name] != $value && !in_array($name, $this->change))) {
$this->change[] = $name; $this->change[] = $name;
} }
// 设置数据对象属性 // 设置数据对象属性
$this->data[$name] = $value; $this->data[$name] = $value;
} }
/** /**