fixed a bug regarding to orWhere

ShisunXia · Nov 13, 2018 · ceb1318 · ceb1318
1 parent c7c1aa2
commit ceb1318
Showing 1 changed file with 7 additions and 15 deletions.
diff --git a/src/LaravelElasticsearchQueryBuilder.php b/src/LaravelElasticsearchQueryBuilder.php
@@ -202,22 +202,14 @@ public function where($column, $operator = null, $value = null, $or = false, $bo
 				break;
 			case '!=':
 				if($or) {
-					$builder = new LaravelElasticsearchQueryBuilder($this->model);
-					$builder->where($column, '!=', $value);
-					if(isset($this->query['bool']['should']['bool']) && $value !== null) {
-						$this->query['bool']['should']['bool']['must_not'][] = [(is_array($value) ? 'terms' : 'term') => [$column => $value]];
-					} else if(isset($this->query['bool']['should']) && $value === null) {
-						$this->query['bool']['should'][] = ['exists' => ['field' => $column]];
+					if($value === null) {
+						$this->query['bool']['should'][] = ['exists' => [
+							'field' => $column
+						]];
 					} else {
-						if($value === null) {
-							$this->query['bool']['should'][] = ['exists' => [
-								'field' => $column
-							]];
-						} else {
-							$this->query['bool']['should']['bool'] = ['must_not' => [
-								[(is_array($value) ? 'terms' : 'term') => [$column => $value]]
-							]];
-						}
+						$this->query['bool']['should'][] = ['bool' => ['must_not' => [
+							[(is_array($value) ? 'terms' : 'term') => [$column => $value]]
+						]]];
 					}
 				} else {
 					if($value === null) {