db类hidden append方法merge参数和模型保持一致

top-think · Oct 30, 2024 · 5f00adb · 5f00adb
1 parent 2254287
commit 5f00adb
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/db/concern/ModelRelationQuery.php b/src/db/concern/ModelRelationQuery.php
@@ -64,7 +64,7 @@ public function getModel()
      */
     public function hidden(array $hidden = [], bool $merge = false)
     {
-        $this->options['hidden'] = $merge ? array_merge($this->options['hidden'], $hidden) : $hidden;
+        $this->options['hidden'] = [$hidden, $merge];
 
         return $this;
     }
@@ -79,7 +79,7 @@ public function hidden(array $hidden = [], bool $merge = false)
      */
     public function visible(array $visible = [], bool $merge = false)
     {
-        $this->options['visible'] = $merge ? array_merge($this->options['visible'], $visible) : $visible;
+        $this->options['visible'] = [$visible, $merge];
 
         return $this;
     }
@@ -94,7 +94,7 @@ public function visible(array $visible = [], bool $merge = false)
      */
     public function append(array $append = [], bool $merge = false)
     {
-        $this->options['append'] = $merge ? array_merge($this->options['append'], $append) : $append;
+        $this->options['append'] = [$append, $merge];
 
         return $this;
     }
@@ -693,7 +693,8 @@ protected function resultToModel(array &$result): void
 
         foreach (['hidden', 'visible', 'append'] as $name) {
             if (isset($this->options[$name])) {
-                $result->$name($this->options[$name]);
+                [$value, $merge] = $this->options[$name];
+                $result->$name($value, $merge);
             }
         }