Merge branch 'develop' of https://github.com/d-rec/drec-origin into V…

…ersion_Bump_0.2
d-rec · Aug 2, 2024 · dbf770c · dbf770c
2 parents f3fdc56 + c0d706c
commit dbf770c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/apps/drec-api/src/pods/device/device.service.ts b/apps/drec-api/src/pods/device/device.service.ts
@@ -137,10 +137,10 @@ export class DeviceService {
     pagenumber: number,
   ): Promise<any> {
     this.logger.verbose(`With in getOrganizationDevices`);
-    if (pagenumber === null || pagenumber === undefined) {
-      pagenumber = 1;
-    }
-    if (Object.keys(filterDto).length != 0) {
+    if (
+      Object.keys(filterDto).length != 0 &&
+      (pagenumber != null || pagenumber != undefined)
+    ) {
       const limit = 20;
       const query = await this.getFilteredQuery(filterDto);
       let where: any = query.where;