diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java index abd15ac80..cc44c5694 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java @@ -172,10 +172,11 @@ public class ProjectRelatedPersonnelController extends JeroController importExcel(MultipartFile file, - @RequestParam(name="projectId",required=true) String projectId, + HttpServletRequest request, + @RequestParam(name="projectId",required=true) String projectId, @RequestParam(name="cut",required=true) String cut) throws IOException, InvalidFormatException { - return projectRelatedPersonnelService.importExcel(file, ProjectRelatedPersonnel.class, projectId, cut); + return projectRelatedPersonnelService.importExcel(file, ProjectRelatedPersonnel.class, projectId, cut, request); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index e3b32c8c9..482e383ca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -80,7 +80,7 @@ public interface IProjectRelatedPersonnelService extends IService importExcel(MultipartFile file, Class clazz, String projectId, String cut) throws IOException, InvalidFormatException; + Result importExcel(MultipartFile file, Class clazz, String projectId, String cut, HttpServletRequest request) throws IOException, InvalidFormatException; Result oppositeDisposeData(List records, String projectId, String cut); 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 57ce96541..5b57d3222 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 @@ -697,8 +697,10 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl importExcel(MultipartFile file, - Class clazz, String projectId, String cut) throws IOException, InvalidFormatException { - + Class clazz, String projectId, String cut, HttpServletRequest request) throws IOException, InvalidFormatException { + //验证token + String token = request.getHeader("X-Access-Token"); + TokenUtils.verifyToken(token, sysBaseAPI, redisUtil); String explainInfo= null; String titleOne = ""; @@ -780,14 +782,22 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl1 && StringUtils.isNotBlank(row.getCell(k).getStringCellValue())) { - if (CutEnum.CN.getValue().equals(cut)) { - throw new JeroBootException("填写说明列数不对,请按照模板格式填写内容"); - } else { - throw new JeroBootException("The number of columns of filling explanation is wrong. Please fill in the contents according to the template format."); + if (StringUtils.isNotBlank(row.getCell(0).getStringCellValue())){ + for (int k = 1; k < columNos; k++){ + if(StringUtils.isNotBlank(row.getCell(k).getStringCellValue())){ + if (CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("第二行填写说明列数不对,请按照模板格式填写内容"); + } else { + throw new JeroBootException("The number of explanatory columns in the second line is incorrect. Please fill in the contents according to the template format."); + } } } + }else { + if (CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("填写说明不能为空,请按照模板格式填写内容"); + } else { + throw new JeroBootException("The description cannot be blank. Please fill in the content according to the template format."); + } } } if (i > 1) {//读取数据