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

改进聚合模型主键和关联键相同的情况

Browse Source
This commit is contained in:
thinkphp
2016-09-30 15:10:10 +08:00
parent c51416c7d4
commit 7f2880603c
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

@@ -126,7 +126,7 @@ class Merge extends Model
$item = []; $item = [];
foreach ($data as $key => $val) { foreach ($data as $key => $val) {
if ($insert || in_array($key, $this->change) || $this->isPk($key)) { if ($insert || in_array($key, $this->change) || $this->isPk($key)) {
if (array_key_exists($key, $this->mapFields)) { if ($this->fk != $key && array_key_exists($key, $this->mapFields)) {
list($name, $key) = explode('.', $this->mapFields[$key]); list($name, $key) = explode('.', $this->mapFields[$key]);
if ($model == $name) { if ($model == $name) {
$item[$key] = $val; $item[$key] = $val;