From eb2fc10bc78bc8d2ad215cc50d63c0440a114d64 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Tue, 26 Apr 2022 13:34:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelServiceImpl.java | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 51dd20950..f6cd6ecef 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -459,24 +459,21 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl records = ExcelImportUtil.importExcel(file.getInputStream(), clazz, params); - for(ProjectRelatedPersonnel projectRelatedPersonnel:records) { - if (StringUtils.isNotBlank(projectRelatedPersonnel.getDutyTerritory()) || StringUtils.isNotBlank(projectRelatedPersonnel.getLawEngineer())) { + if(CollectionUtils.isNotEmpty(records)) { + oppositeDisposeData(records,projectId,cut); - oppositeDisposeData(records, projectId, cut); - - //中英切换提示语 - if (CutEnum.CN.getValue().equals(cut)) { - result.success("文件导入成功！数据行数：" + records.size()); - } else { - result.success("File import succeeded! Number of data rows：" + records.size()); - } - } else { - //中英切换提示语 - if (CutEnum.CN.getValue().equals(cut)) { - result.error500("请先下载模板文件,按照它导入!"); - } else { - result.error500("Please download the template file first and import it according to it!"); - } + //中英切换提示语 + if(CutEnum.CN.getValue().equals(cut)) { + result.success("文件导入成功！数据行数：" + records.size()); + }else{ + result.success("File import succeeded! Number of data rows：" + records.size()); + } + }else{ + //中英切换提示语 + if(CutEnum.CN.getValue().equals(cut)) { + result.error500("数据为空,请检查"); + }else { + result.error500("The data is empty, please check!"); } } } catch (Exception e) {