改进关联属性绑定

top-think · Feb 20, 2025 · 7490f09 · 7490f09
1 parent b0904aa
commit 7490f09
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/model/relation/BelongsTo.php b/src/model/relation/BelongsTo.php
@@ -70,7 +70,7 @@ public function getRelation(array $subRelation = [], ?Closure $closure = null)
         if ($relationModel) {
             if (!empty($this->bindAttr)) {
                 // 绑定关联属性
-                $this->bindAttr($this->parent, $relationModel);
+                $this->parent->bindRelationAttr($relationModel, $this->bindAttr);
             }
 
             $relationModel->setParent(clone $this->parent);
@@ -258,11 +258,6 @@ protected function eagerlySet(array &$resultSet, string $relation, array $subRel
                     $result->bindRelationAttr($relationModel, $this->bindAttr);
                 } else {
                     $result->setRelation($relation, $relationModel);
-                    if (!empty($this->bindAttr)) {
-                        // 绑定关联属性
-                        $this->bindAttr($result, $relationModel);
-                        $result->hidden([$relation], true);
-                    }
                 }
             }
         }

diff --git a/src/model/relation/HasOne.php b/src/model/relation/HasOne.php
@@ -70,7 +70,7 @@ public function getRelation(array $subRelation = [], ?Closure $closure = null)
         if ($relationModel) {
             if (!empty($this->bindAttr)) {
                 // 绑定关联属性
-                $this->bindAttr($this->parent, $relationModel);
+                $this->parent->bindRelationAttr($relationModel, $this->bindAttr);
             }
 
             $relationModel->setParent(clone $this->parent);