diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 9908bf05..5e48c67a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1663,26 +1663,27 @@ public class LawsCommonServiceImpl implements ILawsCommonService { @Override public List importExcelWithData(MultipartFile file, String module) { + List> insertDataList = new ArrayList<>(); + String tableName = TableNameEnum.getTableName(module); + List errorMsgsList; try { - List> insertDataList = new ArrayList<>(); - String tableName = TableNameEnum.getTableName(module); - List errorMsgsList = this.validDataFormat(insertDataList, file, tableName); - // 判断如果校验有问题则返回校验错误信息,没问题则将数据转化为导入方法所需参数 - if (!errorMsgsList.isEmpty()) { - return errorMsgsList; - } else { - // 执行新增功能 - for (Map map : insertDataList) { - // 获取操作模块 - map.put(FieldCommon.MODULE, module); - commonService.commonAdd(map); - } - return new ArrayList<>(); - } + errorMsgsList = this.validDataFormat(insertDataList, file, tableName); } catch (IOException e) { log.error("数据导入异常,请检查", e); throw new JeroBootException("数据导入异常,请检查"); } + // 判断如果校验有问题则返回校验错误信息,没问题则将数据转化为导入方法所需参数 + if (!errorMsgsList.isEmpty()) { + return errorMsgsList; + } else { + // 执行新增功能 + for (Map map : insertDataList) { + // 获取操作模块 + map.put(FieldCommon.MODULE, module); + commonService.commonAdd(map); + } + return new ArrayList<>(); + } } /**