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

改进Merge的save方法

Browse Source
This commit is contained in:
thinkphp
2016-05-22 13:41:16 +08:00
parent 97acdbe0a5
commit f4182cf38f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/think/model/Merge.php
View File

@@ -170,9 +170,6 @@ class Merge extends Model
$this->__set($this->updateTime, null);
}
// 处理模型数据
$data = $this->parseData($this->name, $this->data);
$db = $this->db();
$db->startTrans('merge_save_' . $this->name);
try {
@@ -184,6 +181,8 @@ class Merge extends Model
return false;
}
// 处理模型数据
$data = $this->parseData($this->name, $this->data);
// 写入主表数据
$result = $db->strict(false)->update($data);
@@ -211,8 +210,10 @@ class Merge extends Model
return false;
}
// 处理模型数据
$data = $this->parseData($this->name, $this->data);
// 写入主表数据
$result = $db->name($this->name)->strict(false)->insert($this->data);
$result = $db->name($this->name)->strict(false)->insert($data);
if ($result) {
$insertId = $db->getLastInsID();
// 写入外键数据