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

改进

Browse Source
This commit is contained in:
thinkphp
2017-03-10 11:27:54 +08:00
parent e40962c346
commit d086406a54
1 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
library/think/Model.php
View File

@@ -779,22 +779,6 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
return false; return false;
} }
protected function autoWriteUpdateTime(&$data)
{
// 自动写入更新时间
if ($this->autoWriteTimestamp && $this->updateTime && (empty($this->change) || !in_array($this->updateTime, $this->change))) {
$data[$this->updateTime] = $this->autoWriteTimestamp($this->updateTime);
}
}
protected function autoWriteCreateTime(&$data)
{
// 自动写入创建时间
if ($this->autoWriteTimestamp && $this->createTime && (empty($this->change) || !in_array($this->createTime, $this->change))) {
$data[$this->createTime] = $this->autoWriteTimestamp($this->createTime);
}
}
/** /**
* 保存当前数据对象 * 保存当前数据对象
* @access public * @access public
@@ -886,9 +870,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
} }
} }
if (!empty($data)) { if (!empty($data) && $this->autoWriteTimestamp && $this->updateTime && !isset($data[$this->updateTime])) {
// 自动写入更新时间 // 自动写入更新时间
$this->autoWriteUpdateTime($data); $data[$this->updateTime] = $this->autoWriteTimestamp($this->updateTime);
} else { } else {
return 0; return 0;
} }
@@ -939,10 +923,15 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
} else { } else {
// 自动写入 // 自动写入
$this->autoCompleteData($this->insert); $this->autoCompleteData($this->insert);
// 自动写入创建时间 // 自动写入创建时间和更新时间
$this->autoWriteCreateTime($this->data); if ($this->autoWriteTimestamp) {
// 自动写入更新时间 if ($this->createTime && !isset($this->data[$this->createTime])) {
$this->autoWriteUpdateTime($this->data); $this->data[$this->createTime] = $this->autoWriteTimestamp($this->createTime);
}
if ($this->updateTime && !isset($this->data[$this->updateTime])) {
$this->data[$this->updateTime] = $this->autoWriteTimestamp($this->updateTime);
}
}
if (false === $this->trigger('before_insert', $this)) { if (false === $this->trigger('before_insert', $this)) {
return false; return false;