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; });