diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index fa16da6c..b4e3e608 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -611,24 +611,26 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl headers; -// try { -// headers = ExcelUtils.getHeaderFromExcel(file.getInputStream(), 0); -// } catch (Exception e) { -// errorMsgs.add("模板错误,请按照系统模板导入!"); -// resultMap.put("msg", errorMsgs); -// resultMap.put("flag", YesOrNoEnum.NO.getValue()); -// log.error(e.getMessage(), e); -// return resultMap; // 返回错误信息 -// } -// -// // 使用静态方法验证header -// boolean isMatched = headers.equals(ExcelUtils.getSortedHeadersFromClass(WithoutDistributeExcelTemplate.class)); -// if (!isMatched) { -// errorMsgs.add("模板错误,请按照系统模板导入!"); -// resultMap.put("msg", errorMsgs); -// resultMap.put("flag", YesOrNoEnum.NO.getValue()); -// return resultMap; // 返回错误信息 -// } + try { + @Cleanup + InputStream inputStream = Files.newInputStream(excelfilelist.get(0).toPath()); + headers = ExcelUtils.getHeaderFromExcel(inputStream, 0); + } catch (Exception e) { + errorMsgs.add("模板错误,请按照系统模板导入!"); + resultMap.put("msg", errorMsgs); + resultMap.put("flag", YesOrNoEnum.NO.getValue()); + log.error(e.getMessage(), e); + return resultMap; // 返回错误信息 + } + + // 使用静态方法验证header + boolean isMatched = headers.equals(ExcelUtils.getSortedHeadersFromClass(WithoutDistributeExcelTemplate.class)); + if (!isMatched) { + errorMsgs.add("模板错误,请按照系统模板导入!"); + resultMap.put("msg", errorMsgs); + resultMap.put("flag", YesOrNoEnum.NO.getValue()); + return resultMap; // 返回错误信息 + } ImportParams params = new ImportParams(); params.setTitleRows(0);