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

改进一对一关联预载入

Browse Source
This commit is contained in:
thinkphp
2017-01-22 17:36:56 +08:00
parent b1fa683e3d
commit e2e217f1d6
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,6 @@
namespace think\model\relation; namespace think\model\relation;
use think\Exception;
use think\Loader; use think\Loader;
use think\Model; use think\Model;
@@ -86,12 +85,12 @@ class BelongsTo extends OneToOne
foreach ($resultSet as $result) { foreach ($resultSet as $result) {
// 关联模型 // 关联模型
if (!isset($data[$result->$localKey])) { if (!isset($data[$result->$localKey])) {
throw new Exception('relation data not exists :' . $this->model); $relationModel = null;
} else { } else {
$relationModel = $data[$result->$localKey]; $relationModel = $data[$result->$localKey];
} }
if (!empty($this->bindAttr)) { if ($relationModel && !empty($this->bindAttr)) {
// 绑定关联属性 // 绑定关联属性
$this->bindAttr($relationModel, $result, $this->bindAttr); $this->bindAttr($relationModel, $result, $this->bindAttr);
} }
@@ -117,11 +116,11 @@ class BelongsTo extends OneToOne
$data = $this->eagerlyWhere($this, [$localKey => $result->$foreignKey], $localKey, $relation, $subRelation, $closure); $data = $this->eagerlyWhere($this, [$localKey => $result->$foreignKey], $localKey, $relation, $subRelation, $closure);
// 关联模型 // 关联模型
if (!isset($data[$result->$localKey])) { if (!isset($data[$result->$localKey])) {
throw new Exception('relation data not exists :' . $this->model); $relationModel = null;
} else { } else {
$relationModel = $data[$result->$localKey]; $relationModel = $data[$result->$localKey];
} }
if (!empty($this->bindAttr)) { if ($relationModel && !empty($this->bindAttr)) {
// 绑定关联属性 // 绑定关联属性
$this->bindAttr($relationModel, $result, $this->bindAttr); $this->bindAttr($relationModel, $result, $this->bindAttr);
} }

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

@@ -11,7 +11,6 @@
namespace think\model\relation; namespace think\model\relation;
use think\Exception;
use think\Loader; use think\Loader;
use think\Model; use think\Model;
@@ -113,11 +112,11 @@ class HasOne extends OneToOne
foreach ($resultSet as $result) { foreach ($resultSet as $result) {
// 关联模型 // 关联模型
if (!isset($data[$result->$localKey])) { if (!isset($data[$result->$localKey])) {
throw new Exception('relation data not exists : ' . $this->model); $relationModel = null;
} else { } else {
$relationModel = $data[$result->$localKey]; $relationModel = $data[$result->$localKey];
} }
if (!empty($this->bindAttr)) { if ($relationModel && !empty($this->bindAttr)) {
// 绑定关联属性 // 绑定关联属性
$this->bindAttr($relationModel, $result, $this->bindAttr); $this->bindAttr($relationModel, $result, $this->bindAttr);
} }
@@ -144,12 +143,12 @@ class HasOne extends OneToOne
// 关联模型 // 关联模型
if (!isset($data[$result->$localKey])) { if (!isset($data[$result->$localKey])) {
throw new Exception('relation data not exists :' . $this->model); $relationModel = null;
} else { } else {
$relationModel = $data[$result->$localKey]; $relationModel = $data[$result->$localKey];
} }
if (!empty($this->bindAttr)) { if ($relationModel && !empty($this->bindAttr)) {
// 绑定关联属性 // 绑定关联属性
$this->bindAttr($relationModel, $result, $this->bindAttr); $this->bindAttr($relationModel, $result, $this->bindAttr);
} }