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

改进

Browse Source
This commit is contained in:
thinkphp
2017-04-01 14:07:27 +08:00
parent ae501f4028
commit 68a1882e1e
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/model/relation/BelongsTo.php
View File

@@ -130,7 +130,7 @@ class BelongsTo extends OneToOne
$relationModel = null; $relationModel = null;
} else { } else {
$relationModel = $data[$result->$foreignKey]; $relationModel = $data[$result->$foreignKey];
$relationModel->setParent($result); $relationModel->setParent(clone $result);
$relationModel->isUpdate(true); $relationModel->isUpdate(true);
} }
@@ -163,7 +163,7 @@ class BelongsTo extends OneToOne
$relationModel = null; $relationModel = null;
} else { } else {
$relationModel = $data[$result->$foreignKey]; $relationModel = $data[$result->$foreignKey];
$relationModel->setParent($result); $relationModel->setParent(clone $result);
$relationModel->isUpdate(true); $relationModel->isUpdate(true);
} }
if ($relationModel && !empty($this->bindAttr)) { if ($relationModel && !empty($this->bindAttr)) {

4
library/think/model/relation/HasMany.php
View File

@@ -86,7 +86,7 @@ class HasMany extends Relation
} }
foreach ($data[$result->$localKey] as &$relationModel) { foreach ($data[$result->$localKey] as &$relationModel) {
$relationModel->setParent($result); $relationModel->setParent(clone $result);
} }
$result->setAttr($attr, $this->resultSetBuild($data[$result->$localKey])); $result->setAttr($attr, $this->resultSetBuild($data[$result->$localKey]));
@@ -115,7 +115,7 @@ class HasMany extends Relation
} }
foreach ($data[$result->$localKey] as &$relationModel) { foreach ($data[$result->$localKey] as &$relationModel) {
$relationModel->setParent($result); $relationModel->setParent(clone $result);
} }
$result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$result->$localKey])); $result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$result->$localKey]));

4
library/think/model/relation/HasOne.php
View File

@@ -132,7 +132,7 @@ class HasOne extends OneToOne
$relationModel = null; $relationModel = null;
} else { } else {
$relationModel = $data[$result->$localKey]; $relationModel = $data[$result->$localKey];
$relationModel->setParent($result); $relationModel->setParent(clone $result);
$relationModel->isUpdate(true); $relationModel->isUpdate(true);
if (!empty($this->bindAttr)) { if (!empty($this->bindAttr)) {
// 绑定关联属性 // 绑定关联属性
@@ -165,7 +165,7 @@ class HasOne extends OneToOne
$relationModel = null; $relationModel = null;
} else { } else {
$relationModel = $data[$result->$localKey]; $relationModel = $data[$result->$localKey];
$relationModel->setParent($result); $relationModel->setParent(clone $result);
$relationModel->isUpdate(true); $relationModel->isUpdate(true);
if (!empty($this->bindAttr)) { if (!empty($this->bindAttr)) {
// 绑定关联属性 // 绑定关联属性

4
library/think/model/relation/MorphMany.php
View File

@@ -120,7 +120,7 @@ class MorphMany extends Relation
$data[$result->$pk] = []; $data[$result->$pk] = [];
} }
foreach ($data[$result->$pk] as &$relationModel) { foreach ($data[$result->$pk] as &$relationModel) {
$relationModel->setParent($result); $relationModel->setParent(clone $result);
$relationModel->isUpdate(true); $relationModel->isUpdate(true);
} }
$result->setAttr($attr, $this->resultSetBuild($data[$result->$pk])); $result->setAttr($attr, $this->resultSetBuild($data[$result->$pk]));
@@ -147,7 +147,7 @@ class MorphMany extends Relation
], $relation, $subRelation, $closure); ], $relation, $subRelation, $closure);
foreach ($data[$result->$pk] as &$relationModel) { foreach ($data[$result->$pk] as &$relationModel) {
$relationModel->setParent($result); $relationModel->setParent(clone $result);
$relationModel->isUpdate(true); $relationModel->isUpdate(true);
} }

4
library/think/model/relation/MorphOne.php
View File

@@ -120,7 +120,7 @@ class MorphOne extends Relation
$relationModel = null; $relationModel = null;
} else { } else {
$relationModel = $data[$result->$pk]; $relationModel = $data[$result->$pk];
$relationModel->setParent($result); $relationModel->setParent(clone $result);
$relationModel->isUpdate(true); $relationModel->isUpdate(true);
} }
@@ -150,7 +150,7 @@ class MorphOne extends Relation
if (isset($data[$pk])) { if (isset($data[$pk])) {
$relationModel = $data[$pk]; $relationModel = $data[$pk];
$data[$pk]->setParent($result); $data[$pk]->setParent(clone $result);
$relationModel->isUpdate(true); $relationModel->isUpdate(true);
} else { } else {
$relationModel = null; $relationModel = null;

4
library/think/model/relation/MorphTo.php
View File

@@ -169,7 +169,7 @@ class MorphTo extends Relation
throw new Exception('relation data not exists :' . $this->model); throw new Exception('relation data not exists :' . $this->model);
} else { } else {
$relationModel = $data[$result->$morphKey]; $relationModel = $data[$result->$morphKey];
$relationModel->setParent($result); $relationModel->setParent(clone $result);
$relationModel->isUpdate(true); $relationModel->isUpdate(true);
$result->setAttr($attr, $relationModel); $result->setAttr($attr, $relationModel);
@@ -224,7 +224,7 @@ class MorphTo extends Relation
$pk = $this->parent->{$this->morphKey}; $pk = $this->parent->{$this->morphKey};
$data = (new $model)->with($subRelation)->find($pk); $data = (new $model)->with($subRelation)->find($pk);
if ($data) { if ($data) {
$data->setParent($result); $data->setParent(clone $result);
$data->isUpdate(true); $data->isUpdate(true);
} }
$result->setAttr(Loader::parseName($relation), $data ?: null); $result->setAttr(Loader::parseName($relation), $data ?: null);

2
library/think/model/relation/OneToOne.php
View File

@@ -248,7 +248,7 @@ abstract class OneToOne extends Relation
if (isset($list[$relation])) { if (isset($list[$relation])) {
$relationModel = new $model($list[$relation]); $relationModel = new $model($list[$relation]);
$relationModel->setParent($result); $relationModel->setParent(clone $result);
$relationModel->isUpdate(true); $relationModel->isUpdate(true);
if (!empty($this->bindAttr)) { if (!empty($this->bindAttr)) {