Fix where value is 0 or '0' bug

matrix-lab · Dec 12, 2019 · 8c3c97c · 8c3c97c
1 parent 926893e
commit 8c3c97c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/ConditionsGeneratorTrait.php b/src/ConditionsGeneratorTrait.php
@@ -127,8 +127,10 @@ public function getConditions($args)
 
         // 遍历 where 配置，生成 getList 所需要的 where 结构
         $this->conditions['wheres'] = collect($this->conditions['wheres'])
-            ->filter()
-            ->mapWithKeys(function ($item, $key) use ($args) {
+            ->filter(function($item) {
+                return $item !== null;
+            })
+            ->mapWithKeys(function ($item, $key) {
                 return $this->generateWhereKeyValue($item, $key);
             })->all();
 

diff --git a/src/Lighthouse/Directives/GetlistDirective.php b/src/Lighthouse/Directives/GetlistDirective.php
@@ -107,7 +107,9 @@ function ($root, array $args) use ($value) {
                 $args = collect([
                     'paginator.sort'  => $this->directiveArgValue('sort'),
                     'paginator.sorts' => $this->directiveArgValue('sorts'),
-                ])->merge($args)->filter()->toArray();
+                ])->merge($args)->filter(function($item) {
+                    return $item !== null;
+                })->toArray();
 
                 $model = $this->getPaginatorModel();