From 8580a62fd00a7fb5c93505832dd2e7ef786e6ce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Thu, 4 Mar 2021 15:38:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Database/Base/BaseActiveRecord.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Database/Base/BaseActiveRecord.php b/Database/Base/BaseActiveRecord.php index 27f82311..53913f96 100644 --- a/Database/Base/BaseActiveRecord.php +++ b/Database/Base/BaseActiveRecord.php @@ -16,6 +16,7 @@ use Annotation\Model\Get; use Annotation\Model\Set; use ArrayAccess; use Database\SqlBuilder; +use Database\Traits\HasBase; use HttpServer\Http\Context; use ReflectionException; use Snowflake\Abstracts\Component; @@ -863,8 +864,11 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess return static::getColumns()->_decode($name, $value); } if (in_array($name, $this->_with)) { - var_dump($this->{$this->_relate[$name]}()); - return $this->resolveClass($this->{$this->_relate[$name]}()); + $data = $this->{$this->_relate[$name]}(); + if ($data instanceof HasBase) { + return $data->get(); + } + return $data; } return parent::__get($name); }