修复ConvertJson在定义的函数不为空，restore没回复默认实例的bug

easy-swoole · Aug 31, 2024 · 057053c · 057053c
1 parent d72fb28
commit 057053c
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/src/AbstractInterface/AbstractEntity.php b/src/AbstractInterface/AbstractEntity.php
@@ -67,15 +67,25 @@ function setData(array $data,bool $mergeCompare = false)
             }
             /** @var Property $property */
             $property = $allProperties[$key];
-            if($property->convertObject && ($val !== null)){
-                if($val instanceof $property->convertObject){
-                    $object = $val;
+            if($property->convertObject){
+                if($val !== null){
+                    if($val instanceof $property->convertObject){
+                        $object = $val;
+                    }else{
+                        $object = call_user_func([$property->convertObject,'toObject'],$val);
+                    }
+                    $this->{$key} = $object;
+                    if($mergeCompare){
+                        $this->compareData[$key] = $this->{$key}->toValue();
+                    }
                 }else{
-                    $object = call_user_func([$property->convertObject,'toObject'],$val);
-                }
-                $this->{$key} = $object;
-                if($mergeCompare){
-                    $this->compareData[$key] = $this->{$key}->toValue();
+                    if(!$property->allowNull){
+                        $object = call_user_func([$property->convertObject,'toObject'],$val);
+                        $this->{$key} = $object;
+                        if($mergeCompare){
+                            $this->compareData[$key] = $this->{$key}->toValue();
+                        }
+                    }
                 }
             }else{
                 $this->{$key} = $val;