mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进模型类的checkallowfield方法

Browse Source
This commit is contained in:
thinkphp
2017-07-05 11:35:06 +08:00
parent 5c733a7743
commit e428c43ec5
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
library/think/Model.php
View File

@@ -1094,19 +1094,16 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
protected function checkAllowField($auto = [])
{
if (!empty($this->field)) {
if (!empty($this->origin)) {
$this->field = array_keys($this->origin);
$field = $this->field;
} elseif (true === $this->field) {
$this->field = $this->getQuery()->getTableInfo('', 'fields');
$field = $this->field;
} else {
$field = array_merge($this->field, $auto);
}
if (true === $this->field) {
$this->field = $this->getQuery()->getTableInfo('', 'fields');
$field = $this->field;
} elseif (!empty($this->field)) {
$field = array_merge($this->field, $auto);
} else {
$field = [];
}
return $field;
}