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

修正Relation类的一对多关联预载入查询

Browse Source
This commit is contained in:
thinkphp
2016-08-05 11:09:35 +08:00
parent ac528e0680
commit 3278a7d628
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/model/Relation.php
View File

@@ -93,7 +93,7 @@ class Relation
$result = $relation->where($localKey, $this->parent->$foreignKey)->find(); $result = $relation->where($localKey, $this->parent->$foreignKey)->find();
break; break;
case self::HAS_MANY: case self::HAS_MANY:
$result = $relation->select(); $result = $relation->where($foreignKey, $this->parent->$localKey)->select();
break; break;
case self::HAS_MANY_THROUGH: case self::HAS_MANY_THROUGH:
$result = $relation->select(); $result = $relation->select();
@@ -659,12 +659,6 @@ class Relation
{ {
if ($this->query) { if ($this->query) {
switch ($this->type) { switch ($this->type) {
case self::HAS_MANY:
if (isset($this->parent->{$this->localKey})) {
// 关联查询带入关联条件
$this->query->where($this->foreignKey, $this->parent->{$this->localKey});
}
break;
case self::HAS_MANY_THROUGH: case self::HAS_MANY_THROUGH:
$through = $this->middle; $through = $this->middle;
$model = $this->model; $model = $this->model;