zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

ObjectUtil 新增三个 defaultIfXxx 方法

Browse Source
This commit is contained in:
王良
2022-01-13 14:58:20 +08:00
parent c5673bb06b
commit b4cf5ec9e2
20 changed files with 73 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java
View File

@@ -376,7 +376,7 @@ public class CellUtil {
public static Cell getMergedRegionCell(Sheet sheet, int x, int y) {
return ObjectUtil.defaultIfNull(
getCellIfMergedRegion(sheet, x, y),
SheetUtil.getCell(sheet, y, x));
() -> SheetUtil.getCell(sheet, y, x));
}
/**

2
hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetDataSaxHandler.java
View File

@@ -294,7 +294,7 @@ public class SheetDataSaxHandler extends DefaultHandler {
final int numFmtIndex = xssfCellStyle.getDataFormat();
this.numFmtString = ObjectUtil.defaultIfNull(
xssfCellStyle.getDataFormatString(),
BuiltinFormats.getBuiltinFormat(numFmtIndex));
() -> BuiltinFormats.getBuiltinFormat(numFmtIndex));
if (CellDataType.NUMBER == this.cellDataType && ExcelSaxUtil.isDateFormat(numFmtIndex, numFmtString)) {
cellDataType = CellDataType.DATE;
}