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

改进Relation类的一对多删除

Browse Source
This commit is contained in:
thinkphp
2016-08-07 10:00:12 +08:00
parent c927df2f4b
commit 6698dd41b3
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,8 @@ class Relation
protected $joinType; protected $joinType;
// 关联模型查询对象 // 关联模型查询对象
protected $query; protected $query;
// 关联查询条件
protected $where;
/** /**
* 架构函数 * 架构函数
@@ -93,7 +95,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->where($foreignKey, $this->parent->$localKey)->select(); $result = $relation->select();
break; break;
case self::HAS_MANY_THROUGH: case self::HAS_MANY_THROUGH:
$result = $relation->select(); $result = $relation->select();
@@ -170,7 +172,8 @@ class Relation
} }
if (!empty($range)) { if (!empty($range)) {
$data = $this->eagerlyOneToMany($model, [ $this->where[$foreignKey] = ['in', $range];
$data = $this->eagerlyOneToMany($model, [
$foreignKey => [ $foreignKey => [
'in', 'in',
$range, $range,
@@ -659,6 +662,14 @@ class Relation
{ {
if ($this->query) { if ($this->query) {
switch ($this->type) { switch ($this->type) {
case self::HAS_MANY:
if (isset($this->where)) {
$this->query->where($this->where);
} elseif (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;