- 优化 condition 查询作用域

slowlyo · Nov 7, 2023 · 2d3c767 · 2d3c767
1 parent da59be9
commit 2d3c767
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Traits/ConditionBuilderScopeTrait.php b/src/Traits/ConditionBuilderScopeTrait.php
@@ -9,10 +9,14 @@
  */
 trait ConditionBuilderScopeTrait
 {
-    public function scopeWithConditionBuilder($query)
+    protected bool $conditionBuilderHideTable = false;
+
+    public function scopeWithConditionBuilder($query, $hideTable = false)
     {
         $filter = request('filter_condition_builder');
 
+        $this->conditionBuilderHideTable = $hideTable;
+
         if (blank($filter)) {
             return $query;
         }
@@ -36,7 +40,7 @@ protected function buildConditionBuilderQuery($query, $filter)
     {
         $or = $filter['conjunction'];
 
-        if (method_exists($this, 'qualifyColumn')) {
+        if (method_exists($this, 'qualifyColumn') && !$this->conditionBuilderHideTable) {
             $qualifyColumn = fn($field) => $this->qualifyColumn($field);
         } else {
             $qualifyColumn = fn($field) => $field;