Merge branch 'ade/bug-fixing/cuti-pegawai-baru' into prod/base
This commit is contained in:
commit
e3dc3c5807
@ -2032,8 +2032,12 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
|
|||||||
// Cek Ketika Update Jatah Cuti Otomatis Apakah Mengirimkan Intervensi Cuti Apa Tidak
|
// Cek Ketika Update Jatah Cuti Otomatis Apakah Mengirimkan Intervensi Cuti Apa Tidak
|
||||||
if (CommonUtil.isNullOrEmpty(vo.getIntervensiCuti())) {
|
if (CommonUtil.isNullOrEmpty(vo.getIntervensiCuti())) {
|
||||||
JatahCutiDanIzin currentDataBaseJatahCuti = jatahCutiDanIzinDao.getJatahCuti(vo.getTahun().toString(), vo.getPegawai().getId(), kompIndexVoB.getId());
|
JatahCutiDanIzin currentDataBaseJatahCuti = jatahCutiDanIzinDao.getJatahCuti(vo.getTahun().toString(), vo.getPegawai().getId(), kompIndexVoB.getId());
|
||||||
|
if (CommonUtil.isNullOrEmpty(currentDataBaseJatahCuti)) {
|
||||||
|
vo.setIntervensiCuti(0);
|
||||||
|
}else{
|
||||||
vo.setIntervensiCuti(currentDataBaseJatahCuti.getIntervensiCuti());
|
vo.setIntervensiCuti(currentDataBaseJatahCuti.getIntervensiCuti());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
int todaysYear = Calendar.getInstance().get(Calendar.YEAR);
|
int todaysYear = Calendar.getInstance().get(Calendar.YEAR);
|
||||||
int todaysYear1 = todaysYear - 1;
|
int todaysYear1 = todaysYear - 1;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user