From 00eb482248da5b0b88e944d35b8ccb56fff49ebd Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 25 Apr 2022 10:57:08 +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=E5=AF=BC=E5=85=A5=E6=8E=A5=E6=94=B6=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelServiceImpl.java | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 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 f6cd6ecef..51dd20950 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,21 +459,24 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl records = ExcelImportUtil.importExcel(file.getInputStream(), clazz, params); - if(CollectionUtils.isNotEmpty(records)) { - oppositeDisposeData(records,projectId,cut); + for(ProjectRelatedPersonnel projectRelatedPersonnel:records) { + if (StringUtils.isNotBlank(projectRelatedPersonnel.getDutyTerritory()) || StringUtils.isNotBlank(projectRelatedPersonnel.getLawEngineer())) { - //中英切换提示语 - 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!"); + 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!"); + } } } } catch (Exception e) {