From a4e4fdaca8860a2dd9b1f9e82be243dfce6d88c4 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Wed, 26 Apr 2023 08:08:02 +0700
Subject: [PATCH] Update SlipGajiServiceImpl.java

Perbaikan validasi null existing slip gaji
---
 .../medifirst2000/service/impl/SlipGajiServiceImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java
index 886e53f5..56cc6562 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java
@@ -144,7 +144,7 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 		Date start = DateUtil.startMonth(month);
 		Date end = DateUtil.endMonth(month);
 		Optional<SlipGaji> existedSlipGaji = slipGajiDao.findByPegawaiAndBulan(dto.getIdPegawai(), start, end);
-		if (existedSlipGaji.isPresent()) {
+		if (CommonUtil.isNotNullOrEmpty(existedSlipGaji) && existedSlipGaji.isPresent()) {
 			slipGaji.id(existedSlipGaji.get().getId());
 		} else if (CommonUtil.isNotNullOrEmpty(dto.getId())) {
 			slipGaji.id(dto.getId());
@@ -153,7 +153,7 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 		slipGaji.bulan(month);
 		SlipGaji savedSlip = slipGajiDao.save(slipGaji.build());
 		if (CommonUtil.isNotNullOrEmpty(savedSlip)) {
-			if (!existedSlipGaji.isPresent() && CommonUtil.isNullOrEmpty(dto.getId())) {
+			if (CommonUtil.isNullOrEmpty(existedSlipGaji) && CommonUtil.isNullOrEmpty(dto.getId())) {
 				List<MapPegawaiJabatanToUnitKerja> listMapping = mappingJabatanDao.findByPegawaiId(dto.getIdPegawai());
 				List<SlipGajiDetail> listDetail = new ArrayList<>();
 				listMapping.forEach(j -> {