From a026daa316855c8838ea33ae90c508081b4e353b Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 5 Feb 2024 15:36:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2081773=20=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86-=E5=AF=BC=E5=85=A5=20=E5=BA=94=E8=AF=A5=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E5=AF=BC=E5=85=A5=E8=A2=AB=E4=BB=A3=E6=9B=BF=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=B7=E5=92=8C=E8=A2=AB=E5=BC=95=E7=94=A8=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/common/service/impl/LawsCommonServiceImpl.java | 8 ++++++-- .../laws/standard/controller/LawsDomesticController.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) 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 83b4603c..ae7cf7af 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 @@ -1486,7 +1486,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { fieldList = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getValue() .equals(lawsTag.getIsShowFormCreate().toString())).collect(Collectors.toList()); - // 去除企标导入逻辑不需要显示的字段 + // 去除导入逻辑不需要显示的字段 if (TableNameEnum.ENTERPRISE_STANDARDS.getTableName().equals(tableName)) { fieldList = fieldList.stream() .filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.ENTERPRISE_STANDARD_CODE)) @@ -1495,7 +1495,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService { .filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.YEAR_NUMBER)) .collect(Collectors.toList()); } - + fieldList = fieldList.stream().filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.REPLACED_BY_STANDARD)) + .filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.REFERENCED_STANDARD)) + .collect(Collectors.toList()); // 创建一个Excel工作簿 Workbook workbook = this.createWorkBookWithLawsTags(fieldList); @@ -2514,6 +2516,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { .filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.ENTERPRISE_NAME_CODE)) .filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.STANDARD_CATEGORY_CODE)) .filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.YEAR_NUMBER)) + .filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.REPLACED_BY_STANDARD)) + .filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.REFERENCED_STANDARD)) .collect(Collectors.toList()); // 添加稽查内容字段 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java index 72a3e763..51a6cb02 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java @@ -242,7 +242,7 @@ public class LawsDomesticController { @RequiresPermissions("domesticStandard:import") public Result importExcelWithData(@RequestParam("file") @ApiParam("文件") MultipartFile file) { List errorMessages = lawsCommonService.importExcelWithData(file, TableNameEnum.DOMESTIC_REGULATIONS.getValue()); - if (errorMessages.size() > 0) { + if (!errorMessages.isEmpty()) { return Result.error(MessageUtils.getMessage(ResultCommon.IMPORT_ERROR), errorMessages); } return Result.OK();