Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend

3 months ago · 5ad2e6b369
parent 8a45bc0ce5 0267a5aa61
commit 5ad2e6b369
1 changed files with 3 additions and 3 deletions
--- a/src/controllers/departmentController.js
+++ b/src/controllers/departmentController.js
@ -896,9 +896,9 @@ const getLocationsByCityZoneOffice = async (city, zone, officeName) => {
    }

    // Office name filter
-    // if (officeName && officeName.trim().toUpperCase() !== "ALL") {
-    //   matchCondition.officeName = { $regex: `^${officeName.trim()}$`, $options: "i" };
-    // }
+    if (officeName && officeName.trim().toUpperCase() !== "ALL") {
+      matchCondition.officeName = { $regex: `^${officeName.trim()}$`, $options: "i" };
+    }

    const result = await Zone.aggregate([
      {