From 2eb8d027c06b7d1b711d41079ae43fa192735885 Mon Sep 17 00:00:00 2001
From: ThinkPHP <liuchen@topthink.net>
Date: Mon, 17 Jan 2022 23:59:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=AF=B9=E4=B8=80=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=91=E5=AE=9A=E5=B1=9E=E6=80=A7=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/model/relation/BelongsTo.php | 5 ++---
 src/model/relation/HasOne.php    | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/model/relation/BelongsTo.php b/src/model/relation/BelongsTo.php
index 08aecaa7..0802b11a 100644
--- 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
index e1b6486b..269f0d7f 100644
--- 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);
                 }
             }
         }