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

This commit is contained in:
adesyawal 2025-09-30 19:44:10 +07:00
commit 6f28b48c7a

View File

@ -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);