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

改进多对多关联

Browse Source
This commit is contained in:
thinkphp
2018-10-26 16:12:11 +08:00
parent 26380b7019
commit f89cc5a6e4
8 changed files with 101 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
library/think/db/Query.php
View File

@@ -2130,14 +2130,23 @@ class Query
$this->field('*');
}
foreach ($relations as $key => $relation) {
$closure = false;
$closure = $name = null;
if ($relation instanceof \Closure) {
$closure = $relation;
$relation = $key;
} elseif (!is_int($key)) {
$name = $relation;
$relation = $key;
}
$relation = Loader::parseName($relation, 1, false);
$count = '(' . $this->model->$relation()->getRelationCountQuery($closure) . ')';
$this->field([$count => Loader::parseName($relation) . '_count']);
$count = '(' . $this->model->$relation()->getRelationCountQuery($closure, $name) . ')';
if (empty($name)) {
$name = Loader::parseName($relation) . '_count';
}
$this->field([$count => $name]);
}
}
return $this;