fix: $expand($filter) issue

Soontao · Oct 11, 2020 · fca8f5c · fca8f5c
1 parent 1de6600
commit fca8f5c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/processor/processor.ts b/src/processor/processor.ts
@@ -1023,11 +1023,12 @@ export class ODataProcessor extends Transform {
         (include && filter && include.query) ||
         (!include && this.resourcePath.navigation.indexOf(part) == this.resourcePath.navigation.length - 1)
       ) {
-        queryString = Object.keys((include || this).query).map((p) => {
-          if (p == '$filter' && filter) {
-            (include || this).query[p] = `(${(include || this).query[p]}) and (${filter})`;
+        const theQuery = (include ?? this).query;
+        queryString = Object.keys(theQuery).map((p) => {
+          if (p === '$filter' && filter) {
+            return `${p}=(${theQuery[p]}) and (${filter})`;
           }
-          return `${p}=${(include || this).query[p]}`;
+          return `${p}=${theQuery[p]}`;
         }).join('&') || queryString;
       }