From a6b7c4eb8fe36b5f0c40e5e9ee85e55bda0124b2 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Mon, 20 Nov 2023 16:15:08 +0700 Subject: [PATCH] Update ReportServiceImpl.java Perbaikan validasi golongan pegawai di service report --- .../service/impl/ReportServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java index 1e4f8f9c..613dac78 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java @@ -1929,8 +1929,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic if (Master.StatusPegawai.CUTI_TAHUNAN.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_SAKIT.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_MELAHIRKAN.equals(statusPegawaiId)) { - if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) - .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { + if (CommonUtil.isNotNullOrEmpty(pegawai.get("idGolongan")) + && Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) + .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiA1"); String[] arrCutiA1 = cutiA1.split("_"); labelTtdMenkes = arrCutiA1[0]; @@ -1953,8 +1954,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic } } else if (Master.StatusPegawai.CUTI_BESAR.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_ALASAN_PENTING.equals(statusPegawaiId)) { - if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) - .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { + if (CommonUtil.isNotNullOrEmpty(pegawai.get("idGolongan")) + && Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) + .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB1"); String[] arrCutiA1 = cutiA1.split("_"); labelTtdMenkes = arrCutiA1[0]; @@ -2138,8 +2140,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic if (Master.StatusPegawai.CUTI_TAHUNAN.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_SAKIT.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_MELAHIRKAN.equals(statusPegawaiId)) { - if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) - .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { + if (CommonUtil.isNotNullOrEmpty(pegawai.get("idGolongan")) + && Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) + .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiA1"); String[] arrCutiA1 = cutiA1.split("_"); labelTtdMenkes = arrCutiA1[0]; @@ -2162,8 +2165,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic } } else if (Master.StatusPegawai.CUTI_BESAR.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_ALASAN_PENTING.equals(statusPegawaiId)) { - if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) - .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { + if (CommonUtil.isNotNullOrEmpty(pegawai.get("idGolongan")) + && Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) + .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB1"); String[] arrCutiA1 = cutiA1.split("_"); labelTtdMenkes = arrCutiA1[0];