yazid138 3 年之前
父节点
当前提交
89798851f4
共有 2 个文件被更改,包括 5 次插入8 次删除
  1. 1 1
      controller/sanksi/cabutSanksi.controller.js
  2. 4 7
      utils/cekData.js

+ 1 - 1
controller/sanksi/cabutSanksi.controller.js

@@ -84,7 +84,7 @@ exports.createJawaban = handleError(async (req, res) => {
       ['pengajuan.cabut_sanksi']: { $exists: true, $ne: null },
     },
     {
-      aktif: status === 'Diterima' ? false : true,
+      aktif: false,
       ['jawaban.cabut_sanksi']: {
         status,
         keterangan,

+ 4 - 7
utils/cekData.js

@@ -130,11 +130,8 @@ exports.cekSatuDataSanksi = async (
   return sanksi
 }
 
-exports.cekBanyakDataSanksi = async (
-  user,
-  where = { banding: false, aktif: true }
-) => {
-  const w = { aktif: where.aktif || true }
+exports.cekBanyakDataSanksi = async (user, where = { banding: false }) => {
+  const w = {}
   switch (user.role.id) {
     case 2020:
       if (!where.banding) {
@@ -150,14 +147,14 @@ exports.cekBanyakDataSanksi = async (
       break
   }
   let data = await sanksiModel
-    .find({ aktif: true, ...where })
+    .find({ aktif: where.aktif || true, ...where })
     .populate({
       path: 'laporan',
       select: 'pt',
       match: w,
     })
     .populate('user')
-    .select('-batas_waktu -aktif -dokumen -pelanggaran')
+    .select('-batas_waktu -dokumen -pelanggaran')
     .sort({
       createdAt: -1,
     })