Commit aa23ef1e99024666285e5b3151a1f2894c695b2e
1 parent
e7ac7853
添加新群号：104180207
Showing
2 changed files
with
3 additions
and
3 deletions
README.md
| @@ -81,4 +81,4 @@ | @@ -81,4 +81,4 @@ | ||
| 81 | 81 | ||
| 82 | ## 若依前后端分离交流群 | 82 | ## 若依前后端分离交流群 |
| 83 | 83 | ||
| 84 | -QQ群： [](https://jq.qq.com/?_wv=1027&k=5bVB1og) [](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [](https://jq.qq.com/?_wv=1027&k=5AxMKlC)点击按钮入群。 | ||
| 85 | \ No newline at end of file | 84 | \ No newline at end of file |
| 85 | +QQ群： [](https://jq.qq.com/?_wv=1027&k=5bVB1og) [](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [](https://jq.qq.com/?_wv=1027&k=51G72yr) 点击按钮入群。 | ||
| 86 | \ No newline at end of file | 86 | \ No newline at end of file |
ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
| @@ -174,7 +174,7 @@ public class ExcelUtil<T> | @@ -174,7 +174,7 @@ public class ExcelUtil<T> | ||
| 174 | for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) | 174 | for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) |
| 175 | { | 175 | { |
| 176 | Cell cell = heard.getCell(i); | 176 | Cell cell = heard.getCell(i); |
| 177 | - if (StringUtils.isNotNull(cell != null)) | 177 | + if (StringUtils.isNotNull(cell)) |
| 178 | { | 178 | { |
| 179 | String value = this.getCellValue(heard, i).toString(); | 179 | String value = this.getCellValue(heard, i).toString(); |
| 180 | cellMap.put(value, i); | 180 | cellMap.put(value, i); |
| @@ -827,7 +827,7 @@ public class ExcelUtil<T> | @@ -827,7 +827,7 @@ public class ExcelUtil<T> | ||
| 827 | try | 827 | try |
| 828 | { | 828 | { |
| 829 | Cell cell = row.getCell(column); | 829 | Cell cell = row.getCell(column); |
| 830 | - if (cell != null) | 830 | + if (StringUtils.isNotNull(cell)) |
| 831 | { | 831 | { |
| 832 | if (cell.getCellTypeEnum() == CellType.NUMERIC || cell.getCellTypeEnum() == CellType.FORMULA) | 832 | if (cell.getCellTypeEnum() == CellType.NUMERIC || cell.getCellTypeEnum() == CellType.FORMULA) |
| 833 | { | 833 | { |