From 4b7101a1f12abbe9627b93ccbaedb71c1c76b8f8 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Wed, 22 Jan 2025 21:03:41 +0700 Subject: [PATCH] Update JatahCutiDanIzinServiceImpl.java Perbaikan validasi jatah cuti bersama ditangguhkan melibatkan sisa jatah cuti bersama --- .../service/impl/JatahCutiDanIzinServiceImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JatahCutiDanIzinServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JatahCutiDanIzinServiceImpl.java index 8dc875f8..ccc8e46c 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JatahCutiDanIzinServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JatahCutiDanIzinServiceImpl.java @@ -587,11 +587,8 @@ public class JatahCutiDanIzinServiceImpl implements JatahCutiDanIzinService { int sisaJatah = presensiCutiBersama + cutiDiCutiBersama - cutiBersamaTerpakaiTahunLalu; int jatahDitangguhkan = listPresensiCutiBersamaBisaDitangguhkan.size() - listCutiTahunLaluBelumDisetujui.size(); - if (jatahDitangguhkan >= sisaJatah) { - if (jatahDitangguhkan < 0) - jatahDitangguhkan = 0; + if (sisaJatah >= jatahDitangguhkan && jatahDitangguhkan > 0) return jatahDitangguhkan; - } } return 0; }