修正json字段的hidden方法处理

top-think · Sep 6, 2024 · 9da664e · 9da664e
1 parent e3d5207
commit 9da664e
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/model/concern/Conversion.php b/src/model/concern/Conversion.php
@@ -261,14 +261,19 @@ public function toArray(): array
             } elseif (!isset($hidden[$key]) && !$hasVisible) {
                 $item[$key] = $this->getAttr($key);
             } elseif (in_array($key, $this->json)) {
-                foreach ($hidden[$key] as $name) {
-                    if (is_array($val)) {
-                        unset($val[$name]);
-                    } else {
-                        unset($val->$name);
+                if (isset($hidden[$key]) && is_array($hidden[$key])) {
+                    // 隐藏JSON属性
+                    foreach ($hidden[$key] as $name) {
+                        if (is_array($val)) {
+                            unset($val[$name]);
+                        } else {
+                            unset($val->$name);
+                        }
                     }
+                    $item[$key] = $val;
+                } elseif (!isset($hidden[$key])) {
+                    $item[$key] = $val;
                 }
-                $item[$key] = $val;
             }
 
             if (isset($this->mapping[$key])) {