改进一对一关联写入

top-think · Jan 17, 2022 · 6f5c7f6 · 6f5c7f6
1 parent 14606af
commit 6f5c7f6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/model/relation/BelongsTo.php b/src/model/relation/BelongsTo.php
@@ -277,12 +277,12 @@ protected function eagerlyOne(Model $result, string $relation, array $subRelatio
             $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
@@ -276,11 +276,12 @@ protected function eagerlyOne(Model $result, string $relation, array $subRelatio
             $relationModel->exists(true);
         }
 
+        // 设置关联属性
+        $result->setRelation($relation, $relationModel);
+
         if (!empty($this->bindAttr)) {
             // 绑定关联属性
             $this->bindAttr($result, $relationModel);
-        } else {
-            $result->setRelation($relation, $relationModel);
         }
     }