Merge branch '3.0' of github.com:top-think/think-orm into 3.0

top-think · Jun 25, 2024 · 4bd05de · 4bd05de
2 parents fed3f23 + 6eca261
commit 4bd05de
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/src/db/BaseQuery.php b/src/db/BaseQuery.php
@@ -1355,7 +1355,7 @@ public function find($data = null)
             $this->parsePkWhere($data);
         }
 
-        if (empty($this->options['where']) && empty($this->options['order'])) {
+        if (empty($this->options['where']) && empty($this->options['order']) && empty($this->options['sort'])) {
             $result = [];
         } else {
             $result = $this->connection->find($this);

diff --git a/src/model/relation/HasMany.php b/src/model/relation/HasMany.php
@@ -265,7 +265,7 @@ public function make(array|Model $data = []): Model
         // 保存关联表数据
         $data[$this->foreignKey] = $this->parent->{$this->localKey};
 
-        return new $this->model($data);
+        return (new $this->model($data))->setSuffix($this->getModel()->getSuffix());
     }
 
     /**

diff --git a/src/model/relation/MorphMany.php b/src/model/relation/MorphMany.php
@@ -325,7 +325,7 @@ public function make($data = []): Model
         $data[$this->morphKey]  = $this->parent->$pk;
         $data[$this->morphType] = $this->type;
 
-        return new $this->model($data);
+        return (new $this->model($data))->setSuffix($this->getModel()->getSuffix());
     }
 
     /**

diff --git a/src/model/relation/MorphOne.php b/src/model/relation/MorphOne.php
@@ -300,7 +300,7 @@ public function make(array|Model $data = []): Model
         $data[$this->morphKey]  = $this->parent->$pk;
         $data[$this->morphType] = $this->type;
 
-        return new $this->model($data);
+        return (new $this->model($data))->setSuffix($this->getModel()->getSuffix());
     }
 
     /**

diff --git a/src/model/relation/MorphTo.php b/src/model/relation/MorphTo.php
@@ -243,18 +243,20 @@ public function eagerlyResultSet(array &$resultSet, string $relation, array $sub
             foreach ($range as $key => $val) {
                 // 多态类型映射
                 $model = $this->parseModel($key);
-                $obj = new $model();
-                if (!is_null($closure)) {
-                    $obj = $closure($obj);
-                }
-                $pk = $obj->getPk();
-                $list = $obj->with($subRelation)
-                    ->cache($cache[0] ?? false, $cache[1] ?? null, $cache[2] ?? null)
-                    ->select($val);
                 $data = [];
+                if (class_exists($model)) {
+                    $obj = new $model();
+                    if (!is_null($closure)) {
+                        $obj = $closure($obj);
+                    }
+                    $pk = $obj->getPk();
+                    $list = $obj->with($subRelation)
+                        ->cache($cache[0] ?? false, $cache[1] ?? null, $cache[2] ?? null)
+                        ->select($val);
 
-                foreach ($list as $k => $vo) {
-                    $data[$vo->$pk] = $vo;
+                    foreach ($list as $k => $vo) {
+                        $data[$vo->$pk] = $vo;
+                    }
                 }
 
                 foreach ($resultSet as $result) {

diff --git a/src/model/relation/OneToOne.php b/src/model/relation/OneToOne.php
@@ -232,7 +232,7 @@ public function make(array|Model $data = []): Model
         // 保存关联表数据
         $data[$this->foreignKey] = $this->parent->{$this->localKey};
 
-        return new $this->model($data);
+        return (new $this->model($data))->setSuffix($this->getModel()->getSuffix());
     }
 
     /**