改进关联模型的输出

top-think · Aug 19, 2023 · 5d13905 · 5d13905
1 parent 38a6da3
commit 5d13905
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/model/concern/Conversion.php b/src/model/concern/Conversion.php
@@ -264,7 +264,7 @@ public function toArray(): array
                     $val->hidden($hidden[$key], true);
                 }
                 // 关联模型对象
-                if (!isset($hidden[$key]) || true !== $hidden[$key]) {
+                if (array_key_exists($key,$this->with) && (!isset($hidden[$key]) || true !== $hidden[$key])) {
                     $item[$key] = $val->toArray();
                 }
             } elseif (isset($visible[$key])) {

diff --git a/src/model/concern/RelationShip.php b/src/model/concern/RelationShip.php
@@ -51,6 +51,13 @@ trait RelationShip
      */
     private $relation = [];
 
+    /**
+     * 预载入关联模型
+     *
+     * @var array
+     */    
+    protected $with = [];
+
     /**
      * 关联写入定义信息.
      *
@@ -347,6 +354,8 @@ public function eagerlyResult(array $relations, array $withRelationAttr = [], bo
             }
 
             $relationResult->eagerlyResult($this, $relationName, $subRelation, $closure, $relationCache, $join);
+
+            $this->with[$relationName] = true;
         }
     }