From ade28c695d1db13e38dd075e55073612a830d63a Mon Sep 17 00:00:00 2001
From: "hehihoho3@gmail.com" <hehihoho3@gmail.com>
Date: Thu, 16 Jan 2025 11:19:45 +0900
Subject: [PATCH] =?UTF-8?q?=EC=97=91=EC=85=80=20=EB=B6=88=EB=9F=AC?=
 =?UTF-8?q?=EC=98=A4=EA=B8=B0=200=EA=B0=92=20=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/web/addr/AddrList_advcBack_20240723.jsp       | 2 +-
 .../jsp/web/msgcampain/include/msgDataIncludeExcel.jsp        | 2 +-
 .../WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp   | 3 ++-
 src/main/webapp/js/user/fax/addr/event.js                     | 4 +++-
 src/main/webapp/js/user/fax/exelUpload.js                     | 4 +++-
 src/main/webapp/js/web/addr/event.js                          | 4 +++-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList_advcBack_20240723.jsp b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList_advcBack_20240723.jsp
index d884a104..0aeadc53 100644
--- a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList_advcBack_20240723.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList_advcBack_20240723.jsp
@@ -516,7 +516,7 @@ $(document).ready(function(){
     	var updatedData = currentData.map(row => {
     		var newRow = {};
     		fieldMapping.forEach((field, index) => {
-    			newRow[field] = row[Object.keys(row)[index]] || "";
+    			newRow[field] = row[Object.keys(row)[index]] ?? "";
     		});
     		return newRow;
     	});
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/include/msgDataIncludeExcel.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/include/msgDataIncludeExcel.jsp
index 936d538e..e7b72e9a 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/include/msgDataIncludeExcel.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/include/msgDataIncludeExcel.jsp
@@ -501,7 +501,7 @@ function updateTableFields($objTabul) {
 	var updatedData = currentData.map(row => {
 		var newRow = {};
 		fieldMapping.forEach((field, index) => {
-			newRow[field] = row[Object.keys(row)[index]] || "";
+			newRow[field] = row[Object.keys(row)[index]] ?? "";
 		});
 		return newRow;
 	});
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp
index e73d8aa2..3016456a 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp
@@ -554,9 +554,10 @@ function updateTableFields($objTabul) {
 	});
 
 	var updatedData = currentData.map(row => {
+		console.log('row : ', row);
 		var newRow = {};
 		fieldMapping.forEach((field, index) => {
-			newRow[field] = row[Object.keys(row)[index]] || "";
+			newRow[field] = row[Object.keys(row)[index]] ?? "";
 		});
 		return newRow;
 	});
diff --git a/src/main/webapp/js/user/fax/addr/event.js b/src/main/webapp/js/user/fax/addr/event.js
index 2cd211f9..3b35b9c7 100644
--- a/src/main/webapp/js/user/fax/addr/event.js
+++ b/src/main/webapp/js/user/fax/addr/event.js
@@ -303,7 +303,9 @@ $(document).ready(function(){
 		var updatedData = currentData.map(row => {
 			var newRow = {};
 			fieldMapping.forEach((field, index) => {
-				newRow[field] = row[Object.keys(row)[index]] || "";
+				newRow[field] = row[Object.keys(row)[index]] !== null && row[Object.keys(row)[index]] !== undefined
+				    ? row[Object.keys(row)[index]]
+				    : "";
 			});
 			return newRow;
 		});
diff --git a/src/main/webapp/js/user/fax/exelUpload.js b/src/main/webapp/js/user/fax/exelUpload.js
index 526f148b..9a825021 100644
--- a/src/main/webapp/js/user/fax/exelUpload.js
+++ b/src/main/webapp/js/user/fax/exelUpload.js
@@ -367,7 +367,9 @@ function updateTableFields(objTabul) {
 	var updatedData = currentData.map(row => {
 		var newRow = {};
 		fieldMapping.forEach((field, index) => {
-			newRow[field] = row[Object.keys(row)[index]] || "";
+				newRow[field] = row[Object.keys(row)[index]] !== null && row[Object.keys(row)[index]] !== undefined
+				    ? row[Object.keys(row)[index]]
+				    : "";
 		});
 		return newRow;
 	});
diff --git a/src/main/webapp/js/web/addr/event.js b/src/main/webapp/js/web/addr/event.js
index 83e39e46..b3043ec1 100644
--- a/src/main/webapp/js/web/addr/event.js
+++ b/src/main/webapp/js/web/addr/event.js
@@ -364,7 +364,9 @@ $(document).ready(function(){
 		var updatedData = currentData.map(row => {
 			var newRow = {};
 			fieldMapping.forEach((field, index) => {
-				newRow[field] = row[Object.keys(row)[index]] || "";
+				newRow[field] = row[Object.keys(row)[index]] !== null && row[Object.keys(row)[index]] !== undefined
+				    ? row[Object.keys(row)[index]]
+				    : "";
 			});
 			return newRow;
 		});