Merge branch 'dev/base' into dev/integrasi/minio

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java

@@ -2032,7 +2032,11 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
 			// Cek Ketika Update Jatah Cuti Otomatis Apakah Mengirimkan Intervensi Cuti Apa Tidak
 			if (CommonUtil.isNullOrEmpty(vo.getIntervensiCuti())) {
 				JatahCutiDanIzin currentDataBaseJatahCuti = jatahCutiDanIzinDao.getJatahCuti(vo.getTahun().toString(), vo.getPegawai().getId(), kompIndexVoB.getId());
-				vo.setIntervensiCuti(currentDataBaseJatahCuti.getIntervensiCuti());
+				if (CommonUtil.isNullOrEmpty(currentDataBaseJatahCuti)) {
+					vo.setIntervensiCuti(0);
+				}else{
+					vo.setIntervensiCuti(currentDataBaseJatahCuti.getIntervensiCuti());
+				}
 			}			
 			
 			int todaysYear = Calendar.getInstance().get(Calendar.YEAR);