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

改进模型类对主键的自动读取

Browse Source
This commit is contained in:
thinkphp
2016-04-27 12:42:57 +08:00
parent 8cb52f60dd
commit 6915f0249e
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,7 +184,7 @@ class Merge extends Model
$table = is_int($key) ? self::db()->name($model)->getTable() : $model;
// 处理关联模型数据
$data = $this->parseData($name, $this->data);
self::db()->table($table)->strict(false)->where($this->fk, $this->data[$this->pk])->update($data);
self::db()->table($table)->strict(false)->where($this->fk, $this->data[$this->getPk()])->update($data);
}
// 新增回调
$this->trigger('after_update', $this);
@@ -238,7 +238,7 @@ class Merge extends Model
$result = self::db()->delete($this->data);
if ($result) {
// 获取主键数据
$pk = $this->data[$this->pk];
$pk = $this->data[$this->getPk()];
// 删除关联数据
foreach (static::$relationModel as $key => $model) {