From b55a5931a4fc0cbb714cb714d1e934b618682542 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 24 Sep 2024 18:24:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/base/service/impl/TbPeopleServiceImpl.java | 4 ++-- .../com/bonus/base/service/impl/TbProPowerServiceImpl.java | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java index 2981bbb..26e4820 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java @@ -295,9 +295,9 @@ public class TbPeopleServiceImpl implements TbPeopleService { String fileName = file.getOriginalFilename(); if (fileName != null) { String fileExtension = fileName.substring(fileName.lastIndexOf(".") + 1); - if (!Constants.XLS.equalsIgnoreCase(fileExtension) && !Constants.XLSX.equalsIgnoreCase(fileExtension)) { + if (!Constants.XLSX.equalsIgnoreCase(fileExtension)) { // 文件后缀名不符合要求 - return AjaxResult.error("导入失败：文件后缀名不符合要求,必须为xls或xlsx结尾"); + return AjaxResult.error("导入失败：文件后缀名不符合要求,必须为xlsx结尾"); } } try { diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProPowerServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProPowerServiceImpl.java index d28996e..37a21e3 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProPowerServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProPowerServiceImpl.java @@ -140,15 +140,12 @@ public class TbProPowerServiceImpl implements TbProPowerService { */ @Override public AjaxResult importTbProPower(MultipartFile file, Long id) { - if (file.getSize() > 10 * 1024 * 1024) { - return AjaxResult.error("文件过大，请上传10M以内的文件"); - } String fileName = file.getOriginalFilename(); if (fileName != null) { String fileExtension = fileName.substring(fileName.lastIndexOf(".") + 1); - if (!Constants.XLS.equalsIgnoreCase(fileExtension) && !Constants.XLSX.equalsIgnoreCase(fileExtension)) { + if (!Constants.XLSX.equalsIgnoreCase(fileExtension)) { // 文件后缀名不符合要求 - return AjaxResult.error("导入失败：文件后缀名不符合要求,必须为xls或xlsx结尾"); + return AjaxResult.error("导入失败：文件后缀名不符合要求,必须为xlsx结尾"); } }