Merge remote-tracking branch 'origin/master'

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

@@ -267,7 +267,6 @@ public class ScenarioServiceImpl implements ScenarioService {
             File file = new File(path);
             FileInputStream fis = new FileInputStream(file);
             workbook = new XSSFWorkbook(fis);
-            workbook = new XSSFWorkbook(fis);
             ByteArrayOutputStream os = new ByteArrayOutputStream();
             Sheet sheet = workbook.getSheetAt(0);
             Row row = sheet.getRow(2);
@@ -449,7 +448,7 @@ public class ScenarioServiceImpl implements ScenarioService {
             result.put("message", BundleUtils.getLangString("customer.errorValidate", locale));
         }finally {
             if (workbook != null) workbook.close();
-            result.put("code", Constants.FILE_UPLOAD_RESP_CODE.ERROR);
+            //result.put("code", Constants.FILE_UPLOAD_RESP_CODE.ERROR);
         }
         return result;
     }