e

2021-08-16 11:24:57 +08:00
parent e6b7158d5a
commit 92d02bd564
4 changed files with 16 additions and 5 deletions
@@ -268,9 +268,7 @@ class ActiveRecord extends BaseActiveRecord
 		if ($resolve instanceof HasBase) {
 			$resolve = $resolve->get();
 		}
-		if ($resolve instanceof Collection) {
-			return $resolve->toArray();
-		} else if ($resolve instanceof ActiveRecord) {
+		if ($resolve instanceof ObjectToArray) {
 			return $resolve->toArray();
 		} else if (is_object($resolve)) {
 			return get_object_vars($resolve);