as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2021-03-04 15:38:17 +08:00
parent 80fa502372
commit 8580a62fd0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/Base/BaseActiveRecord.php
+6 -2
View File
@@ -16,6 +16,7 @@ use Annotation\Model\Get;
use Annotation\Model\Set; use Annotation\Model\Set;
use ArrayAccess; use ArrayAccess;
use Database\SqlBuilder; use Database\SqlBuilder;
use Database\Traits\HasBase;
use HttpServer\Http\Context; use HttpServer\Http\Context;
use ReflectionException; use ReflectionException;
use Snowflake\Abstracts\Component; use Snowflake\Abstracts\Component;
@@ -863,8 +864,11 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
return static::getColumns()->_decode($name, $value); return static::getColumns()->_decode($name, $value);
} }
if (in_array($name, $this->_with)) { if (in_array($name, $this->_with)) {
var_dump($this->{$this->_relate[$name]}()); $data = $this->{$this->_relate[$name]}();
return $this->resolveClass($this->{$this->_relate[$name]}()); if ($data instanceof HasBase) {
return $data->get();
}
return $data;
} }
return parent::__get($name); return parent::__get($name);
} }