commit

controller/v1/sanksi.controller.js

@@ -414,18 +414,15 @@ exports.getAll = handleError(async (req, res) => {
     where['sanksi.level'] = { $in: [2, 3] }
   }
   if (bypassCabutSanksi === 'true') {
-    where.$or = [
-      {
-        'jawaban.cabut_sanksi.status': { $ne: 'Diterima' }
-      },
-      {
-        masa_berlaku: {
-          $exists: true,
-          $ne: null
-        }
-      }
-    ]
+    where['masa_berlaku.from_date'] = {
+      $exists: true,
+        $ne: null
+    }
     where.aktif = true
+    where.bypass_cabut_sanksi = {
+      $exists: false,
+      $eq: null,
+    }
   }
   const data = await cekBanyakDataSanksi(user, where, q)
   return response.success(res, {