|  | @@ -195,11 +195,11 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |          Map<String, PictureData> pictures;
 |  |          Map<String, PictureData> pictures;
 | 
											
												
													
														|  |          if (isXSSFWorkbook)
 |  |          if (isXSSFWorkbook)
 | 
											
												
													
														|  |          {
 |  |          {
 | 
											
												
													
														|  | -            pictures = getSheetPictrues07((XSSFSheet) sheet, (XSSFWorkbook) wb);
 |  | 
 | 
											
												
													
														|  | 
 |  | +            pictures = getSheetPictures07((XSSFSheet) sheet, (XSSFWorkbook) wb);
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |          else
 |  |          else
 | 
											
												
													
														|  |          {
 |  |          {
 | 
											
												
													
														|  | -            pictures = getSheetPictrues03((HSSFSheet) sheet, (HSSFWorkbook) wb);
 |  | 
 | 
											
												
													
														|  | 
 |  | +            pictures = getSheetPictures03((HSSFSheet) sheet, (HSSFWorkbook) wb);
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |          // 获取最后一个非空行的行下标,比如总行数为n,则返回的为n-1
 |  |          // 获取最后一个非空行的行下标,比如总行数为n,则返回的为n-1
 | 
											
												
													
														|  |          int rows = sheet.getLastRowNum();
 |  |          int rows = sheet.getLastRowNum();
 | 
											
										
											
												
													
														|  | @@ -1196,7 +1196,7 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |       * @param workbook 工作簿对象
 |  |       * @param workbook 工作簿对象
 | 
											
												
													
														|  |       * @return Map key:图片单元格索引(1_1)String,value:图片流PictureData
 |  |       * @return Map key:图片单元格索引(1_1)String,value:图片流PictureData
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
												
													
														|  | -    public static Map<String, PictureData> getSheetPictrues03(HSSFSheet sheet, HSSFWorkbook workbook)
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public static Map<String, PictureData> getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook)
 | 
											
												
													
														|  |      {
 |  |      {
 | 
											
												
													
														|  |          Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();
 |  |          Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();
 | 
											
												
													
														|  |          List<HSSFPictureData> pictures = workbook.getAllPictures();
 |  |          List<HSSFPictureData> pictures = workbook.getAllPictures();
 | 
											
										
											
												
													
														|  | @@ -1229,7 +1229,7 @@ public class ExcelUtil<T>
 | 
											
												
													
														|  |       * @param workbook 工作簿对象
 |  |       * @param workbook 工作簿对象
 | 
											
												
													
														|  |       * @return Map key:图片单元格索引(1_1)String,value:图片流PictureData
 |  |       * @return Map key:图片单元格索引(1_1)String,value:图片流PictureData
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
												
													
														|  | -    public static Map<String, PictureData> getSheetPictrues07(XSSFSheet sheet, XSSFWorkbook workbook)
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public static Map<String, PictureData> getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook)
 | 
											
												
													
														|  |      {
 |  |      {
 | 
											
												
													
														|  |          Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();
 |  |          Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();
 | 
											
												
													
														|  |          for (POIXMLDocumentPart dr : sheet.getRelations())
 |  |          for (POIXMLDocumentPart dr : sheet.getRelations())
 |