改名

2021-03-04 15:05:46 +08:00
parent 5d1a3b3533
commit 5a237cdd77
4 changed files with 23 additions and 19 deletions
@@ -245,7 +245,7 @@ class ActiveRecord extends BaseActiveRecord
 	 */
 	private function resolveObject($method): mixed
 	{
-		$resolve = $this->$method();
+		$resolve = $this->{$this->getRelate($method)}();
 		if ($resolve instanceof HasBase) {
 			$resolve = $resolve->get();
 		}
@@ -296,11 +296,11 @@ class ActiveRecord extends BaseActiveRecord
 	private function runRelate(): array
 	{
 		$relates = [];
-		if (empty($this->_relate)) {
+		if (empty($this->_with)) {
 			return $relates;
 		}
-		foreach ($this->_relate as $key => $val) {
-			$relates[$key] = $this->resolveObject($val);
+		foreach ($this->_with as $val) {
+			$relates[$val] = $this->resolveObject($val);
 		}
 		return $relates;
 	}