quangdn

src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java

@@ -1364,21 +1364,21 @@ public class CustomerServiceImpl implements CustomerService {
                                     cfo.setFieldOptionValueId(cfov.getFieldOptionValueId());
                                     break;
                                 case "checkbox":
-                                    if (rawDataList.get(i)[headerMap.get(dynamicHeader.get(j).getTitle())].toString().trim().equals(BundleUtils.getLangString("customer.yes", locale))) {
+                                    if (rawDataList.get(i)[headerMap.get(dynamicHeader.get(j).getTitle().trim())].toString().trim().equals(BundleUtils.getLangString("customer.yes", locale))) {
                                         cfo.setValueCheckbox(1L);
                                     } else {
                                         cfo.setValueCheckbox(0L);
                                     }
                                     break;
                                 case "date":
-                                    Date date = dateFormat.parse(rawDataList.get(i)[headerMap.get(dynamicHeader.get(j).getTitle())].toString().trim());
+                                    Date date = dateFormat.parse(rawDataList.get(i)[headerMap.get(dynamicHeader.get(j).getTitle().trim())].toString().trim());
                                     cfo.setValueDate(date);
                                     break;
                                 case "number":
-                                    cfo.setValueNumber(Long.parseLong(rawDataList.get(i)[headerMap.get(dynamicHeader.get(j).getTitle())].toString().trim()));
+                                    cfo.setValueNumber(Long.parseLong(rawDataList.get(i)[headerMap.get(dynamicHeader.get(j).getTitle().trim())].toString().trim()));
                                     break;
                                 default:
-                                    cfo.setValueText(rawDataList.get(i)[headerMap.get(dynamicHeader.get(j).getTitle())].toString().trim());
+                                    cfo.setValueText(rawDataList.get(i)[headerMap.get(dynamicHeader.get(j).getTitle().trim())].toString().trim());
                                     break;
                             }
                         }
@@ -1386,7 +1386,7 @@ public class CustomerServiceImpl implements CustomerService {
                         cfo.setCreateDate(new Date());
                         cfo.setStatus(1L);
                         cfo.setFunctionCode("CUSTOMER");
-                        cfo.setTitle(dynamicHeader.get(j).getTitle());
+                        cfo.setTitle(dynamicHeader.get(j).getTitle().trim());
                         customizeFieldObjectRepository.save(cfo);
                     }
                     CustomerListMapping clm = new CustomerListMapping();