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

改进Query类的field方法

Browse Source
This commit is contained in:
thinkphp
2016-08-08 10:33:34 +08:00
parent 3cf55ec9ca
commit f21e6827e1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -728,11 +728,11 @@ class Query
} }
if (true === $field) { if (true === $field) {
// 获取全部字段 // 获取全部字段
$fields = isset($this->options['allow_field']) ? $this->options['allow_field'] : $this->getTableInfo($tableName, 'fields'); $fields = isset($this->options['allow_field']) ? $this->options['allow_field'] : $this->getTableInfo($tableName ?: $this->options['table'], 'fields');
$field = $fields ?: ['*']; $field = $fields ?: ['*'];
} elseif ($except) { } elseif ($except) {
// 字段排除 // 字段排除
$fields = isset($this->options['allow_field']) ? $this->options['allow_field'] : $this->getTableInfo($tableName, 'fields'); $fields = isset($this->options['allow_field']) ? $this->options['allow_field'] : $this->getTableInfo($tableName ?: $this->options['table'], 'fields');
$field = $fields ? array_diff($fields, $field) : $field; $field = $fields ? array_diff($fields, $field) : $field;
} }
if ($tableName) { if ($tableName) {