fix: db query

Signed-off-by: Ke Ma <ke.ma@king.com>
2023-04-25 13:36:53 +02:00
parent e6231859bc
commit 2b99c76ef5
1 changed files with 11 additions and 10 deletions
@@ -413,17 +413,18 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
    const isOrderingDescending = sortField.order === 'desc';

    if (prevItemOrderFieldValue) {
-      dbQuery.andWhere(
-        'value',
-        isFetchingBackwards !== isOrderingDescending ? '<' : '>',
-        prevItemOrderFieldValue,
-      );
-      dbQuery.orWhere(function nested() {
-        this.where('value', '=', prevItemOrderFieldValue).andWhere(
-          'search.entity_id',
+      dbQuery.andWhere(function nested() {
+        this.where(
+          'value',
          isFetchingBackwards !== isOrderingDescending ? '<' : '>',
-          prevItemUid,
-        );
+          prevItemOrderFieldValue,
+        )
+          .orWhere('value', '=', prevItemOrderFieldValue)
+          .andWhere(
+            'search.entity_id',
+            isFetchingBackwards !== isOrderingDescending ? '<' : '>',
+            prevItemUid,
+          );
      });
    }