Merge query fields to wheres.

zhuzhichao · Nov 11, 2020 · ff26ecf · ff26ecf
1 parent 0a363e6
commit ff26ecf
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/ConditionsGenerator.php b/src/ConditionsGenerator.php
@@ -50,12 +50,11 @@ private function parseParams(): void
         foreach (self::$allowParamKeys as $key) {
             if (isset($this->params[$key])) {
                 $this->customParams[$key] = $this->params[$key];
+                unset($this->params[$key]);
             }
         }
 
-        if(empty($this->customParams)) {
-            $this->customParams['wheres'] = $this->params;
-        }
+        $this->customParams['wheres'] = array_merge($this->customParams['wheres'], $this->params);
     }
 
     protected function wheres(): array