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

改进模型类的save方法

Browse Source
This commit is contained in:
thinkphp
2017-05-20 14:47:42 +08:00
parent 53a819ff5b
commit a45586ad02
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
library/think/Model.php
View File

@@ -952,15 +952,15 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
} }
$pk = $this->getPk(); $pk = $this->getPk();
if ($this->isUpdate) { if ($this->isUpdate) {
// 获取有更新的数据
$data = $this->getChangedData();
// 检测字段 // 检测字段
$this->checkAllowField($data); $this->checkAllowField($this->data, array_merge($this->auto, $this->update));
// 自动更新 // 自动更新
$this->autoCompleteData($this->update); $this->autoCompleteData($this->update);
// 获取有更新的数据
$data = $this->getChangedData();
// 事件回调 // 事件回调
if (false === $this->trigger('before_update', $this)) { if (false === $this->trigger('before_update', $this)) {
return false; return false;
@@ -1009,7 +1009,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
} else { } else {
// 检测字段 // 检测字段
$this->checkAllowField($this->data); $this->checkAllowField($this->data, array_merge($this->auto, $this->insert));
// 自动写入 // 自动写入
$this->autoCompleteData($this->insert); $this->autoCompleteData($this->insert);
@@ -1061,14 +1061,18 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
return $result; return $result;
} }
protected function checkAllowField(&$data) protected function checkAllowField(&$data, $auto = [])
{ {
if (!empty($this->field)) { if (!empty($this->field)) {
if (true === $this->field) { if (true === $this->field) {
$this->field = $this->getQuery()->getTableInfo('', 'fields'); $this->field = $this->getQuery()->getTableInfo('', 'fields');
$field = $this->field;
} else {
$field = array_merge($this->field, $auto);
} }
foreach ($data as $key => $val) { foreach ($data as $key => $val) {
if (!in_array($key, $this->field)) { if (!in_array($key, $field)) {
unset($data[$key]); unset($data[$key]);
} }
} }