Merge branch 'develop'

common/Factory/Model.php

@@ -23,6 +23,16 @@ class Model {
     return $this;
   }
   public function create(string $model_class, array $data = null): ModelInterface {
+    if ($data !== null) {
+      $model = $this->find($model_class);
+      foreach ($data as $f => $v) {
+        $model = $model->where([[$f, $v]]);
+      }
+      $model = $model->one();
+      if ($model !== false) {
+        return $model;
+      }
+    }
     return BaseModel::factory($model_class)->create($data);
   }
   protected $class;
@@ -334,11 +344,17 @@ class Model {
 
   public function one($id = null): ModelInterface {
     $result = $this->build()->findOne($id);
+    if (!$result) {
+      return false;
+    }
     $result->setFactory($this);
     return $result;
   }
   public function many(): array {
     $results = $this->build()->findMany();
+    if (!$results) {
+      return false;
+    }
     foreach ($results as &$r) {
       $r->setFactory($this);
     }
@@ -346,6 +362,9 @@ class Model {
   }
   public function array(): array {
     $results = $this->build()->findArray();
+    if (!$results) {
+      return false;
+    }
     return $results;
   }