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 2b04e1369..f4b65867d 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 @@ -499,21 +499,19 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl titleOneList = Arrays.asList(titleOne.split(",")); @@ -714,27 +708,27 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl0 && StringUtils.isNotBlank(row.getCell(k).getStringCellValue())) { + if (row.getPhysicalNumberOfCells()>1 && StringUtils.isNotBlank(row.getCell(k).getStringCellValue())) { if (CutEnum.CN.getValue().equals(cut)) { - throw new JeroBootException("填写说明列数不对,请严格按照模板文件导入数据"); + throw new JeroBootException("填写说明列数不对,请按照模板格式填写内容"); } else { - throw new JeroBootException("The number of columns of filling explanation is wrong. Please import data strictly according to the template file."); + throw new JeroBootException("The number of columns of filling explanation is wrong. Please fill in the contents according to the template format."); } } } @@ -827,10 +820,8 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl f.getItemText().equals(projectRelatedPersonnel.getDutyTerritory())).map(e -> e.getItemValue()).collect(Collectors.toList()); - System.out.println(dutyTerritoryValueList); } else { dutyTerritoryValueList = sysDictItemList.stream().filter(f -> f.getEnName().equals(projectRelatedPersonnel.getDutyTerritory())).map(e -> e.getItemValue()).collect(Collectors.toList()); - System.out.println(dutyTerritoryValueList); } //责任领域