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

改进聚合模型 主表的主键名和附表的关联键名一致导致关联数据写入错误的问题

Browse Source
This commit is contained in:
thinkphp
2016-09-29 21:11:35 +08:00
parent 5098d53ea9
commit 62cd93f1fe
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,7 +245,7 @@ class Merge extends Model
// 写入附表数据 // 写入附表数据
$source = $this->data; $source = $this->data;
if ($insertId && is_string($pk) && isset($source[$pk])) { if ($insertId && is_string($pk) && isset($source[$pk]) && $this->fk != $pk) {
unset($source[$pk]); unset($source[$pk]);
} }
foreach (static::$relationModel as $key => $model) { foreach (static::$relationModel as $key => $model) {