From c8ff8b9f7a5f21e396631ab7dc8d4333ed236d9a Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sun, 31 Jan 2016 20:55:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3traits\model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/traits/model/Auto.php     | 2 +-
 library/traits/model/Relation.php | 2 +-
 library/traits/model/View.php     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/traits/model/Auto.php b/library/traits/model/Auto.php
index 894db057..815aada2 100644
--- a/library/traits/model/Auto.php
+++ b/library/traits/model/Auto.php
@@ -77,7 +77,7 @@ trait Auto
         // 验证完成生成数据对象
         if ($this->autoCheckFields && empty($this->options['link'])) {
             // 开启字段检测并且没有关联表 则过滤非法字段数据
-            $fields = $this->getDbFields();
+            $fields = $this->getFields();
             foreach ($keys as $i => $key) {
                 if (!in_array($key, $fields)) {
                     unset($data[$key]);
diff --git a/library/traits/model/Relation.php b/library/traits/model/Relation.php
index 5405120b..3585c8ef 100644
--- a/library/traits/model/Relation.php
+++ b/library/traits/model/Relation.php
@@ -375,7 +375,7 @@ trait Relation
             return false;
         }
         if (!empty($this->_link)) {
-            $fields = $this->getDbFields();
+            $fields = $this->getFields();
             // 遍历关联定义
             foreach ($this->_link as $key => $val) {
                 // 操作制定关联类型
diff --git a/library/traits/model/View.php b/library/traits/model/View.php
index a84a7b8d..87d0f111 100644
--- a/library/traits/model/View.php
+++ b/library/traits/model/View.php
@@ -91,7 +91,7 @@ trait View
     {
         if (false !== $pos = array_search('*', $fields)) {
             // 定义所有字段
-            $fields = array_merge($fields, M($name)->getDbFields());
+            $fields = array_merge($fields, \think\Loader::model($name)->getFields());
             unset($fields[$pos]);
         }
         return $fields;