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

变更

Browse Source
This commit is contained in:
向林
2023-04-10 17:53:20 +08:00
parent ecfe15c3ac
commit 5b3e2bb569
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Base/Model.php
+1 -1
View File
@@ -676,7 +676,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
* @param $name * @param $name
* @return mixed|null * @return mixed|null
*/ */
private function withRelate($name): mixed protected function withRelate($name): mixed
{ {
$response = $this->{'get' . ucfirst($name)}(); $response = $this->{'get' . ucfirst($name)}();
if ($response instanceof HasBase) { if ($response instanceof HasBase) {
Model.php
+1 -4
View File
@@ -274,10 +274,7 @@ class Model extends Base\Model
{ {
$with = $this->getWith(); $with = $this->getWith();
foreach ($with as $value) { foreach ($with as $value) {
$join = $this->{'get' . ucfirst($value)}(); $join = $this->withRelate($value);
if ($join instanceof HasBase) {
$join = $join->get();
}
if ($join instanceof Kiri\ToArray) { if ($join instanceof Kiri\ToArray) {
$join = $join->toArray(); $join = $join->toArray();
} }