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

关联查询支持远程一对多关联 Query类view方法的field参数支持传入true

Browse Source
This commit is contained in:
thinkphp
2016-05-25 17:57:50 +08:00
parent 62b01bf566
commit e890d43d55
3 changed files with 92 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -667,17 +667,21 @@ class Query
$alias = $join;
}
$table = !empty($table) ? $table : $this->getTable($join);
if (is_string($field)) {
$field = explode(',', $field);
}
foreach ($field as $key => $val) {
if (is_numeric($key)) {
$fields[] = $alias . '.' . $val;
$this->options['map'][$val] = $alias . '.' . $val;
} else {
$fields[] = $alias . '.' . $key . ' AS ' . $val;
$this->options['map'][$val] = $alias . '.' . $key;
if(true === $field){
$fields = $alias . '.*';
}else{
if (is_string($field)) {
$field = explode(',', $field);
}
foreach ($field as $key => $val) {
if (is_numeric($key)) {
$fields[] = $alias . '.' . $val;
$this->options['map'][$val] = $alias . '.' . $val;
} else {
$fields[] = $alias . '.' . $key . ' AS ' . $val;
$this->options['map'][$val] = $alias . '.' . $key;
}
}
}
$this->field($fields);
if ($on) {