Merge branch 'ade/bug-fixing/cuti-pegawai-baru' into prod/base

Add New Jatah Cuti For New Employee
2025-09-30 19:43:19 +07:00 · 2025-09-30 19:39:43 +07:00
1 changed files with 5 additions and 1 deletions
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java
+++ b/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);
Author	SHA1	Message	Date
adesyawal	e3dc3c5807	Merge branch 'ade/bug-fixing/cuti-pegawai-baru' into prod/base	2025-09-30 19:43:19 +07:00
adesyawal	ccfeecc7c6	Add New Jatah Cuti For New Employee	2025-09-30 19:39:43 +07:00