From 9298007c7c41fc324f26eb7081a3f8d43e290d7e Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Tue, 1 Mar 2022 09:06:18 +0700
Subject: [PATCH] Update PegawaiJadwalKerjaService Perbaikan validasi data
 pegawai null saat import excel jadwal dinas pegawai

---
 .../service/impl/PegawaiJadwalKerjaServiceImpl.java            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiJadwalKerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiJadwalKerjaServiceImpl.java
index 80d022e1..18f4fe2d 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiJadwalKerjaServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiJadwalKerjaServiceImpl.java
@@ -289,7 +289,8 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 			if (!listKdShift.contains(xvo.getKdShift())) {
 				listKdShift.add(xvo.getKdShift().toLowerCase());
 			}
-			if (!listIdPegawai.contains(xvo.getPegawai().getId())) {
+			if (CommonUtil.isNotNullOrEmpty(xvo.getPegawai()) && CommonUtil.isNotNullOrEmpty(xvo.getPegawai().getId())
+					&& !listIdPegawai.contains(xvo.getPegawai().getId())) {
 				listIdPegawai.add(xvo.getPegawai().getId());
 			}
 		}