改名

2020-09-08 00:49:15 +08:00
parent 2f5b3abf47
commit 6bab3c8f1e
3 changed files with 40 additions and 12 deletions
@@ -219,21 +219,12 @@ class ActiveQuery extends Component
 	public function all()
 	{
 		$data = $this->modelClass::getDb()
-			->createCommand($this->getBuild()->count($this))
+			->createCommand($this->queryBuilder())
 			->all();

 		$collect = new Collection();
 		$collect->setModel($this->modelClass);
-		if (empty($data) || !is_array($data)) {
-			return $this->asArray ? [] : $collect;
-		}
-
-		$_tmp = [];
-		$model = Snowflake::createObject($this->modelClass);
-		foreach ($data as $key => $val) {
-			$_tmp[] = $this->populate(clone $model, $val);
-		}
-		$collect->setItems($_tmp);
+		$collect->setItems($data);
 		if ($this->asArray) {
 			return $collect->toArray();
 		}