改进数据集withattr方法

top-think · Sep 3, 2024 · a7c1324 · a7c1324
1 parent 302e683
commit a7c1324
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/model/Collection.php b/src/model/Collection.php
@@ -174,7 +174,7 @@ public function setParent(Model $parent)
     public function withAttr(string|array $name, callable $callback = null)
     {
         $this->each(function (Model $model) use ($name, $callback) {
-            $model->withAttr($name, $callback);
+            $model->withFieldAttr($name, $callback);
         });
 
         return $this;

diff --git a/src/model/concern/Attribute.php b/src/model/concern/Attribute.php
@@ -136,7 +136,7 @@ trait Attribute
      * 自动写入字段.
      *
      * @var array
-     */    
+     */
     protected $autoInsertFields = [];
 
     /**
@@ -587,9 +587,9 @@ protected function getJsonValue(string $name, $value)
 
         foreach ($this->withAttr[$name] as $key => $closure) {
             if ($this->jsonAssoc) {
-                $value[$key] = $closure($value[$key], $value);
+                $value[$key] = $closure($value[$key] ?? '', $value);
             } else {
-                $value->$key = $closure($value->$key, $value);
+                $value->$key = $closure($value->$key ?? '', $value);
             }
         }