From 214af3fae6e96169d9eef412d7b885a727c5c23f Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 31 Jul 2024 19:43:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2087827=20=E6=B3=95=E8=A7=84=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B=EF=BC=88?= =?UTF-8?q?=E4=B8=BB=E6=8E=92=E6=9F=A5=E4=BA=BA=E5=88=86=E6=89=B9=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=EF=BC=89=20--=E4=B8=8D=E5=88=86=E5=8F=91--=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=85=B6=E4=BB=96zip=E6=96=87=E4=BB=B6=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E5=BB=BA=E8=AE=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...essStandardComplianceCheckServiceImpl.java | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) 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);