From 6244356d3a5c3891b098fafedaed6064a2a9aa51 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 21 Oct 2021 14:59:00 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=2041173=20=E5=AF=BC=E5=85=A5--?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=9B=BE=E7=89=87=E5=90=8E=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E6=9C=89=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/quartz/controller/QuartzJobController.java | 5 +++++ .../system/controller/SysAnnouncementController.java | 6 ++++++ .../jero/modules/system/controller/SysDepartController.java | 4 ++++ .../jero/modules/system/controller/SysRoleController.java | 5 +++++ .../jero/modules/system/controller/SysUserController.java | 4 ++++ 5 files changed, 24 insertions(+) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java b/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java index 9abc8a7d..180a2a9d 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java @@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.ImportExcelUtil; import com.jero.modules.quartz.entity.QuartzJob; @@ -236,6 +237,10 @@ public class QuartzJobController { int successLines = 0, errorLines = 0; for (Map.Entry entity : fileMap.entrySet()) { MultipartFile file = entity.getValue();// 获取上传文件对象 + // 校验文件是否为excel + if(!ImportExcelUtil.checkExcelFile(file)){ + throw new JeroBootException("请导入excel文件！"); + } ImportParams params = new ImportParams(); params.setTitleRows(2); params.setHeadRows(1); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java index 5dc43ad7..e3362244 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java @@ -11,7 +11,9 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.util.ImportExcelUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; @@ -370,6 +372,10 @@ public class SysAnnouncementController { Map fileMap = multipartRequest.getFileMap(); for (Map.Entry entity : fileMap.entrySet()) { MultipartFile file = entity.getValue();// 获取上传文件对象 + // 校验文件是否为excel + if(!ImportExcelUtil.checkExcelFile(file)){ + throw new JeroBootException("请导入excel文件！"); + } ImportParams params = new ImportParams(); params.setTitleRows(2); params.setHeadRows(1); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index 53372c53..d4104380 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -392,6 +392,10 @@ public class SysDepartController { Map fileMap = multipartRequest.getFileMap(); for (Map.Entry entity : fileMap.entrySet()) { MultipartFile file = entity.getValue();// 获取上传文件对象 + // 校验文件是否为excel + if(!ImportExcelUtil.checkExcelFile(file)){ + throw new JeroBootException("请导入excel文件！"); + } ImportParams params = new ImportParams(); params.setTitleRows(1); params.setHeadRows(1); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java index 1fb3d991..d7a7a9af 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java @@ -13,6 +13,7 @@ import cn.hutool.core.util.StrUtil; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.SysDepartTreeModel; import com.jero.common.system.vo.SysRoleTreeModel; +import com.jero.common.util.ImportExcelUtil; import com.jero.modules.system.entity.*; import com.jero.modules.system.service.*; import io.swagger.annotations.ApiOperation; @@ -333,6 +334,10 @@ public class SysRoleController { Map fileMap = multipartRequest.getFileMap(); for (Map.Entry entity : fileMap.entrySet()) { MultipartFile file = entity.getValue();// 获取上传文件对象 + // 校验文件是否为excel + if(!ImportExcelUtil.checkExcelFile(file)){ + throw new JeroBootException("请导入excel文件！"); + } ImportParams params = new ImportParams(); params.setTitleRows(2); params.setHeadRows(1); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 0b7b5015..6eec25fb 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -719,6 +719,10 @@ public class SysUserController { int successLines = 0, errorLines = 0; for (Map.Entry entity : fileMap.entrySet()) { MultipartFile file = entity.getValue();// 获取上传文件对象 + // 校验文件是否为excel + if(!ImportExcelUtil.checkExcelFile(file)){ + throw new JeroBootException("请导入excel文件！"); + } ImportParams params = new ImportParams(); params.setTitleRows(1); params.setHeadRows(1);