diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java index 9730b20..921d159 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java @@ -154,13 +154,14 @@ public class CreditUserController extends BaseController { int successCount = 0; try { + int sheetIndex = ExcelImportSupport.findSheetIndex(file, "招投标", 0); List list = null; int usedTitleRows = 0; int usedHeadRows = 0; int[][] tryConfigs = new int[][]{{1, 1}, {0, 1}, {0, 2}, {0, 3}}; for (int[] config : tryConfigs) { - list = filterEmptyRows(tryImport(file, config[0], config[1])); + list = filterEmptyRows(tryImport(file, config[0], config[1], sheetIndex)); if (!CollectionUtils.isEmpty(list)) { usedTitleRows = config[0]; usedHeadRows = config[1]; @@ -174,7 +175,7 @@ public class CreditUserController extends BaseController { User loginUser = getLoginUser(); Integer currentUserId = loginUser != null ? loginUser.getUserId() : null; Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null; - Map urlMap = readNameHyperlinks(file, 0, usedTitleRows, usedHeadRows); + Map urlMap = readNameHyperlinks(file, sheetIndex, usedTitleRows, usedHeadRows); for (int i = 0; i < list.size(); i++) { CreditUserImportParam param = list.get(i); @@ -275,11 +276,11 @@ public class CreditUserController extends BaseController { workbook.close(); } - private List tryImport(MultipartFile file, int titleRows, int headRows) throws Exception { + private List tryImport(MultipartFile file, int titleRows, int headRows, int sheetIndex) throws Exception { ImportParams importParams = new ImportParams(); importParams.setTitleRows(titleRows); importParams.setHeadRows(headRows); - importParams.setStartSheetIndex(0); + importParams.setStartSheetIndex(sheetIndex); importParams.setSheetNum(1); return ExcelImportUtil.importExcel(file.getInputStream(), CreditUserImportParam.class, importParams); }