改名

2021-02-25 18:28:02 +08:00
parent 20ee6f6b0c
commit 1759cc6696
1 changed files with 2 additions and 10 deletions
@@ -206,17 +206,9 @@ class ActiveRecord extends BaseActiveRecord
 		$primary = $this->getPrimary();

 		if (!empty($primary)) {
-			$sul = static::deleteByCondition([$primary => $this->getAttribute($primary)]);
-		} else {
-			$sul = static::deleteByCondition($conditions);
+			$conditions = [$primary => $this->getAttribute($primary)];
 		}
-		if (!$sul) {
-			return false;
-		}
-		if (method_exists($this, 'afterDelete')) {
-			$this->afterDelete();
-		}
-		return true;
+		return static::deleteByCondition($conditions);
 	}