From e96322043649fdc8fc02d886ac19cf8342a43248 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期一, 04 十一月 2024 11:37:13 +0800
Subject: [PATCH] 在登录时判断用户密码过期需要修改时，由于还未登录去获取当前Session的用户时，是null，所以导致报错，增加如果为空，直接使用界面传的用户。
---
Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/ExcelUtil.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/ExcelUtil.java b/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/ExcelUtil.java
index 2ed445e..34712cd 100644
--- a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/ExcelUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/ExcelUtil.java
@@ -871,7 +871,7 @@
* @return 鏁版嵁鍒楄〃
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- public static List<SheetDataSet> readDataObjectFromExcel(File file) throws VciBaseException {
+ public static List<SheetDataSet> readDataObjectFromExcel(File file) throws VciBaseException {
return readDataObjectFromExcel(file, SheetDataSet.class);
}
@@ -997,6 +997,7 @@
try {
for (int sheetIndex = 0; sheetIndex < workbook.getNumberOfSheets(); sheetIndex++) {
Sheet sheet = workbook.getSheetAt(sheetIndex);
+ String sheetName=sheet.getSheetName();
if(StringUtils.isNotBlank(excelOption.getSheetName())){
if(!sheet.getSheetName().equalsIgnoreCase(excelOption.getSheetName())){
continue;
--
Gitblit v1.9.3