commit

controller/sanksi.controller.js

@@ -355,13 +355,13 @@ exports.getAll = handleError(async (req, res) => {
     if (jawaban === 'false') {
       where.$or = [
         {
-        "pengajuan.cabut_sanksi": {
-          $exists: true, $ne: null}
+          "pengajuan.cabut_sanksi": {
+            $exists: true, $ne: null},
         }, {
           bypass_cabut_sanksi: true,
-          aktif: true,
         }
       ]
+      where.aktif = true
       // where.$or = where.$or.map(e => ({ ...e, ['pengajuan.cabut_sanksi']: { $exists: true, $ne: null } }))
       // where['jawaban.cabut_sanksi'] = { $exists: true, $ne: null }
     }