--- src/main/webapp/WEB-INF/jsp/web/addr/AddrList_advcBack_20240723.jsp
+++ src/main/webapp/WEB-INF/jsp/web/addr/AddrList_advcBack_20240723.jsp
... | ... | @@ -516,7 +516,7 @@ |
| 516 | 516 |
var updatedData = currentData.map(row => {
|
| 517 | 517 |
var newRow = {};
|
| 518 | 518 |
fieldMapping.forEach((field, index) => {
|
| 519 |
- newRow[field] = row[Object.keys(row)[index]] || ""; |
|
| 519 |
+ newRow[field] = row[Object.keys(row)[index]] ?? ""; |
|
| 520 | 520 |
}); |
| 521 | 521 |
return newRow; |
| 522 | 522 |
}); |
--- src/main/webapp/WEB-INF/jsp/web/msgcampain/include/msgDataIncludeExcel.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/include/msgDataIncludeExcel.jsp
... | ... | @@ -501,7 +501,7 @@ |
| 501 | 501 |
var updatedData = currentData.map(row => {
|
| 502 | 502 |
var newRow = {};
|
| 503 | 503 |
fieldMapping.forEach((field, index) => {
|
| 504 |
- newRow[field] = row[Object.keys(row)[index]] || ""; |
|
| 504 |
+ newRow[field] = row[Object.keys(row)[index]] ?? ""; |
|
| 505 | 505 |
}); |
| 506 | 506 |
return newRow; |
| 507 | 507 |
}); |
--- src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp
... | ... | @@ -554,9 +554,10 @@ |
| 554 | 554 |
}); |
| 555 | 555 |
|
| 556 | 556 |
var updatedData = currentData.map(row => {
|
| 557 |
+ console.log('row : ', row);
|
|
| 557 | 558 |
var newRow = {};
|
| 558 | 559 |
fieldMapping.forEach((field, index) => {
|
| 559 |
- newRow[field] = row[Object.keys(row)[index]] || ""; |
|
| 560 |
+ newRow[field] = row[Object.keys(row)[index]] ?? ""; |
|
| 560 | 561 |
}); |
| 561 | 562 |
return newRow; |
| 562 | 563 |
}); |
--- src/main/webapp/js/user/fax/addr/event.js
+++ src/main/webapp/js/user/fax/addr/event.js
... | ... | @@ -303,7 +303,9 @@ |
| 303 | 303 |
var updatedData = currentData.map(row => {
|
| 304 | 304 |
var newRow = {};
|
| 305 | 305 |
fieldMapping.forEach((field, index) => {
|
| 306 |
- newRow[field] = row[Object.keys(row)[index]] || ""; |
|
| 306 |
+ newRow[field] = row[Object.keys(row)[index]] !== null && row[Object.keys(row)[index]] !== undefined |
|
| 307 |
+ ? row[Object.keys(row)[index]] |
|
| 308 |
+ : ""; |
|
| 307 | 309 |
}); |
| 308 | 310 |
return newRow; |
| 309 | 311 |
}); |
--- src/main/webapp/js/user/fax/exelUpload.js
+++ src/main/webapp/js/user/fax/exelUpload.js
... | ... | @@ -367,7 +367,9 @@ |
| 367 | 367 |
var updatedData = currentData.map(row => {
|
| 368 | 368 |
var newRow = {};
|
| 369 | 369 |
fieldMapping.forEach((field, index) => {
|
| 370 |
- newRow[field] = row[Object.keys(row)[index]] || ""; |
|
| 370 |
+ newRow[field] = row[Object.keys(row)[index]] !== null && row[Object.keys(row)[index]] !== undefined |
|
| 371 |
+ ? row[Object.keys(row)[index]] |
|
| 372 |
+ : ""; |
|
| 371 | 373 |
}); |
| 372 | 374 |
return newRow; |
| 373 | 375 |
}); |
--- src/main/webapp/js/web/addr/event.js
+++ src/main/webapp/js/web/addr/event.js
... | ... | @@ -364,7 +364,9 @@ |
| 364 | 364 |
var updatedData = currentData.map(row => {
|
| 365 | 365 |
var newRow = {};
|
| 366 | 366 |
fieldMapping.forEach((field, index) => {
|
| 367 |
- newRow[field] = row[Object.keys(row)[index]] || ""; |
|
| 367 |
+ newRow[field] = row[Object.keys(row)[index]] !== null && row[Object.keys(row)[index]] !== undefined |
|
| 368 |
+ ? row[Object.keys(row)[index]] |
|
| 369 |
+ : ""; |
|
| 368 | 370 |
}); |
| 369 | 371 |
return newRow; |
| 370 | 372 |
}); |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?