一对一关联查询绑定属性调整

top-think · Jan 17, 2022 · 2eb8d02 · 2eb8d02 · mrdznet · Feb 19, 2022
1 parent 6f5c7f6
commit 2eb8d02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/model/relation/BelongsTo.php b/src/model/relation/BelongsTo.php
@@ -236,12 +236,11 @@ protected function eagerlySet(array &$resultSet, string $relation, array $subRel
                     $relationModel->exists(true);
                 }
 
+                // 设置关联属性
+                $result->setRelation($relation, $relationModel);
                 if (!empty($this->bindAttr)) {
                     // 绑定关联属性
                     $this->bindAttr($result, $relationModel);
-                } else {
-                    // 设置关联属性
-                    $result->setRelation($relation, $relationModel);
                 }
             }
         }

diff --git a/src/model/relation/HasOne.php b/src/model/relation/HasOne.php
@@ -234,13 +234,12 @@ protected function eagerlySet(array &$resultSet, string $relation, array $subRel
                     $relationModel->setParent(clone $result);
                     $relationModel->exists(true);
                 }
+                // 设置关联属性
+                $result->setRelation($relation, $relationModel);
 
                 if (!empty($this->bindAttr)) {
                     // 绑定关联属性
                     $this->bindAttr($result, $relationModel);
-                } else {
-                    // 设置关联属性
-                    $result->setRelation($relation, $relationModel);
                 }
             }
         }