Skip to content

Commit db9ef2f

Browse files
Merge pull request #82 from CodeWithDennis/feature/introduce-with-trashed-method
Fixed undefined method issue
2 parents 5a1b15d + 3c5b2be commit db9ef2f

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/SelectTree.php

+7-3
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,13 @@ private function buildTree(): Collection
134134
$nullParentQuery = $this->evaluate($this->modifyQueryUsing, ['query' => $nullParentQuery]);
135135
}
136136

137-
// Fetch results for both queries
138-
$nullParentResults = $nullParentQuery->withTrashed($this->withTrashed)->get();
139-
$nonNullParentResults = $nonNullParentQuery->withTrashed($this->withTrashed)->get();
137+
if ($this->withTrashed) {
138+
$nullParentQuery->withTrashed($this->withTrashed);
139+
$nonNullParentQuery->withTrashed($this->withTrashed);
140+
}
141+
142+
$nullParentResults = $nullParentQuery->get();
143+
$nonNullParentResults = $nonNullParentQuery->get();
140144

141145
// Combine the results from both queries
142146
$combinedResults = $nullParentResults->concat($nonNullParentResults);

0 commit comments

Comments
 (0)