Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java =================================================================== diff -u -r38465 -r38466 --- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java (.../InventoryRecordManagerImpl.java) (revision 38465) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java (.../InventoryRecordManagerImpl.java) (revision 38466) @@ -2314,14 +2314,14 @@ //序号 String rowIndex = ParerUtils.getCellFormatValue(row, 0); // 外部编码 - String externalCode = ParerUtils.getEscapeStringCellValue(row, 1); + String externalCode = ParerUtils.getStringCellValue(row, 1); // 物品名称 - String name = ParerUtils.getEscapeStringCellValue(row, 2); + String name = ParerUtils.getStringCellValue(row, 2); if (StringUtils.isBlank(name)) { throw new ImportDataException("第" + currentRowNum + "行物品名称不能为空!"); } //规格 - String specification = ParerUtils.getEscapeStringCellValue(row, 3); + String specification = ParerUtils.getStringCellValue(row, 3); // 失效日期 Date expDate = null; String expDateStr = ParerUtils.getCellFormatValue(row, 4); @@ -2391,22 +2391,22 @@ throw new ImportDataException("第" + currentRowNum+ "行的物品单价必须为有效数字!"); } // 供应商 - String supplierName = ParerUtils.getEscapeStringCellValue(row, 9); + String supplierName = ParerUtils.getStringCellValue(row, 9); //顺序号 String sequence = ParerUtils.getCellFormatValue(row, 10); //返回json对象 JSONObject importInventoryRecord = new JSONObject(); importInventoryRecord.put("rowIndex", rowIndex); - importInventoryRecord.put("externalCode", externalCode); - importInventoryRecord.put("name", name); - importInventoryRecord.put("specification", specification); + importInventoryRecord.put("externalCode", StringEscapeUtils.escapeJavaScript(externalCode)); + importInventoryRecord.put("name", StringEscapeUtils.escapeJavaScript(name)); + importInventoryRecord.put("specification", StringEscapeUtils.escapeJavaScript(specification)); importInventoryRecord.put("expDate", expDate); importInventoryRecord.put("batchNumber", StringEscapeUtils.escapeJavaScript(batchNumber)); importInventoryRecord.put("storage", storage); importInventoryRecord.put("amount", amount); importInventoryRecord.put("price", price); - importInventoryRecord.put("supplierName", supplierName); + importInventoryRecord.put("supplierName", StringEscapeUtils.escapeJavaScript(supplierName)); importInventoryRecord.put("sequence", sequence); return importInventoryRecord; Index: forgon-tools/src/main/java/com/forgon/tools/excel/ParerUtils.java =================================================================== diff -u -r38462 -r38466 --- forgon-tools/src/main/java/com/forgon/tools/excel/ParerUtils.java (.../ParerUtils.java) (revision 38462) +++ forgon-tools/src/main/java/com/forgon/tools/excel/ParerUtils.java (.../ParerUtils.java) (revision 38466) @@ -354,10 +354,10 @@ * @param cellNum * @return */ - public static String getEscapeStringCellValue(HSSFRow row, int cellNum) { + public static String getStringCellValue(HSSFRow row, int cellNum) { HSSFCell cell = row.getCell(cellNum); if (cell != null && cell.getCellType() == HSSFCell.CELL_TYPE_STRING) { - return StringEscapeUtils.escapeJavaScript(getStringCellValue(cell)); + return getStringCellValue(cell); } return getCellValue(cell, null); }