@7365admin1/core 2.28.1 → 2.29.0

package/dist/index.mjs

@@ -34118,7 +34118,7 @@ function useOccurrenceBookRepo() {
     date = "",
     status = ""
   }, session) {
-    page = page > 0 ? page - 1 : 0;
+    page = page > 0 && !date ? page - 1 : 0;
     const _site = toObjectId12(site);
     const query = {
       site: _site,
@@ -37599,12 +37599,15 @@ function useIncidentReportRepo() {
     }
     if (dateFrom) {
       const [year, month, day] = dateFrom.split("-").map(Number);
-      const start = new Date(year, month - 1, day, 0, 0, 0, 0).toISOString();
-      const end = new Date(year, month - 1, day, 23, 59, 59, 999).toISOString();
+      const offset = 8;
+      const start = new Date(Date.UTC(year, month - 1, day, -offset, 0, 0, 0));
+      const end = new Date(
+        Date.UTC(year, month - 1, day, 23 - offset, 59, 59, 999)
+      );
       dateExpr = {
         "incidentInformation.incidentTypeAndTime.dateOfIncident": {
-          $gte: start,
-          $lte: end
+          $gte: start.toISOString(),
+          $lte: end.toISOString()
         }
       };
     }