fix. first and countAllResult Recove tempUseSoftDeletes

Author: nyufeng

system/Model.php

@@ -486,6 +486,7 @@ public function first()
 		$eventData = $this->trigger('afterFind', ['data' => $row]);
 
 		$this->tempReturnType = $this->returnType;
+		$this->tempUseSoftDeletes = $this->useSoftDeletes;
 
 		return $eventData['data'];
 	}
@@ -1577,7 +1578,8 @@ public function countAllResults(bool $reset = true, bool $test = false)
 		{
 			$this->builder()->where($this->table . '.' . $this->deletedField, null);
 		}
-
+		$this->tempUseSoftDeletes = $this->useSoftDeletes;
+		
 		return $this->builder()->countAllResults($reset, $test);
 	}
 

tests/system/Database/Live/ModelTest.php

@@ -1823,4 +1823,24 @@ public function testUndefinedMethodInBuilder()
 			->getBindings();
 	}
 
+	public function testFirstRecoverTempUseSoftDeletes()
+	{
+		$model = new UserModel($this->db);
+		$model->delete(1);
+		$user = $model->withDeleted()->first();
+		$this->assertEquals(1, $user->id);
+		$user2 = $model->first();
+		$this->assertEquals(2, $user2->id);
+
+	}
+
+	public function testcountAllResultsRecoverTempUseSoftDeletes()
+	{
+		$model = new UserModel($this->db);
+		$model->delete(1);
+		$this->assertEquals(4, $model->withDeleted()->countAllResults());
+		$this->assertEquals(3, $model->countAllResults());
+
+	}
+
 }