From f36fa9d3dbceb6d888c10f6c7249e391bcfc53a3 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Tue, 6 Jun 2023 07:49:07 +0700
Subject: [PATCH] Update MonitoringAbsenServiceImpl.java

Pembuatan validasi IP address client di presensi pegawai
---
 .../service/impl/MonitoringAbsenServiceImpl.java   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java
index a874e51c..67f24b1a 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java
@@ -1755,7 +1755,8 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 											&& CommonUtil.isNotNullOrEmpty(temp.get("processtatus"))) {
 										dataPM.put("validMasuk",
 												validate(temp.get("ip_addr").toString(),
-														temp.get("client_ip_addr").toString(),
+														CommonUtil.isNotNullOrEmpty(temp.get("client_ip_addr"))
+																? temp.get("client_ip_addr").toString() : "",
 														Integer.valueOf(temp.get("processtatus").toString())));
 									} else {
 										dataPM.put("validMasuk", "Y");
@@ -1775,7 +1776,8 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 											&& CommonUtil.isNotNullOrEmpty(temp.get("processtatus"))) {
 										dataPM.put("validPulang",
 												validate(temp.get("ip_addr").toString(),
-														temp.get("client_ip_addr").toString(),
+														CommonUtil.isNotNullOrEmpty(temp.get("client_ip_addr"))
+																? temp.get("client_ip_addr").toString() : "",
 														Integer.valueOf(temp.get("processtatus").toString())));
 									} else {
 										dataPM.put("validPulang", "Y");
@@ -1992,7 +1994,9 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 							if (CommonUtil.isNotNullOrEmpty(temp.get("ip_addr"))
 									&& CommonUtil.isNotNullOrEmpty(temp.get("processtatus"))) {
 								data.put("validMasuk",
-										validate(temp.get("ip_addr").toString(), temp.get("client_ip_addr").toString(),
+										validate(temp.get("ip_addr").toString(),
+												CommonUtil.isNotNullOrEmpty(temp.get("client_ip_addr"))
+														? temp.get("client_ip_addr").toString() : "",
 												Integer.valueOf(temp.get("processtatus").toString())));
 							} else {
 								data.put("validMasuk", "Y");
@@ -2011,7 +2015,9 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 							if (CommonUtil.isNotNullOrEmpty(temp.get("ip_addr"))
 									&& CommonUtil.isNotNullOrEmpty(temp.get("processtatus"))) {
 								data.put("validPulang",
-										validate(temp.get("ip_addr").toString(), temp.get("client_ip_addr").toString(),
+										validate(temp.get("ip_addr").toString(),
+												CommonUtil.isNotNullOrEmpty(temp.get("client_ip_addr"))
+														? temp.get("client_ip_addr").toString() : "",
 												Integer.valueOf(temp.get("processtatus").toString())));
 							} else {
 								data.put("validPulang", "Y");