改进Model类的getAttr方法

library/think/Model.php

@@ -365,7 +365,12 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
     public function getAttr($name)
     {
         try {
+            $notFound = false;
             $value    = $this->getData($name);
+        } catch (InvalidArgumentException $e) {
+            $notFound = true;
+        }
+
         // 检测属性获取器
         $method = 'get' . Loader::parseName($name, 1) . 'Attr';
         if (method_exists($this, $method)) {
@@ -373,19 +378,17 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
         } elseif (isset($this->type[$name])) {
             // 类型转换
             $value = $this->readTransform($value, $this->type[$name]);
-            }
+        } elseif ($notFound) {
-            return $value;
-        } catch (InvalidArgumentException $e) {
             if (method_exists($this, $name) && !method_exists('\think\Model', $name)) {
                 // 不存在该字段 获取关联数据
                 $value = $this->relation()->getRelation($name);
                 // 保存关联对象值
                 $this->data[$name] = $value;
-                return $value;
             } else {
                 throw new InvalidArgumentException('property not exists:' . $this->class . '->' . $name);
             }
         }
+        return $value;
     }
 
     /**