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

Merge模型save方法和model类参数和返回值统一

Browse Source
This commit is contained in:
thinkphp
2016-09-13 22:54:22 +08:00
parent 3e79ff0c28
commit b14c1a9dc2
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,11 +144,10 @@ class Merge extends Model
* @access public * @access public
* @param mixed $data 数据 * @param mixed $data 数据
* @param array $where 更新条件 * @param array $where 更新条件
* @param bool $getId 新增的时候是否获取id * @param string $sequence 自增序列名
* @param bool $replace 是否replace * @return integer|false
* @return mixed
*/ */
public function save($data = [], $where = [], $getId = true, $replace = false) public function save($data = [], $where = [], $sequence = null)
{ {
if (!empty($data)) { if (!empty($data)) {
// 数据自动验证 // 数据自动验证
@@ -230,11 +229,13 @@ class Merge extends Model
// 处理模型数据 // 处理模型数据
$data = $this->parseData($this->name, $this->data, true); $data = $this->parseData($this->name, $this->data, true);
// 写入主表数据 // 写入主表数据
$result = $db->name($this->name)->strict(false)->insert($data, $replace); $result = $db->name($this->name)->strict(false)->insert($data);
if ($result) { if ($result) {
$insertId = $db->getLastInsID(); $insertId = $db->getLastInsID($sequence);
// 写入外键数据 // 写入外键数据
$this->data[$this->fk] = $insertId; if ($insertId) {
$this->data[$this->fk] = $insertId;
}
// 写入附表数据 // 写入附表数据
foreach (static::$relationModel as $key => $model) { foreach (static::$relationModel as $key => $model) {
@@ -245,7 +246,6 @@ class Merge extends Model
$query = clone $db; $query = clone $db;
$query->table($table)->strict(false)->insert($data); $query->table($table)->strict(false)->insert($data);
} }
$result = $insertId;
} }
// 新增回调 // 新增回调
$this->trigger('after_insert', $this); $this->trigger('after_insert', $this);