改进Query类的field方法

This commit is contained in:
thinkphp
2016-08-08 10:33:34 +08:00
parent 3cf55ec9ca
commit f21e6827e1

View File

@@ -728,11 +728,11 @@ class Query
}
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 ?: ['*'];
} 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;
}
if ($tableName) {