From 4e7379646247c5b059106f63c7f1e9c8f535848e Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 19 七月 2022 15:16:58 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/controller/ProductBomApprovingController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/controller/ProductBomApprovingController.java b/src/main/java/com/whyc/controller/ProductBomApprovingController.java
index 87d8f17..f4e5972 100644
--- a/src/main/java/com/whyc/controller/ProductBomApprovingController.java
+++ b/src/main/java/com/whyc/controller/ProductBomApprovingController.java
@@ -37,7 +37,7 @@
public Response excelParse(@RequestParam("file") MultipartFile file) throws IOException, InvalidFormatException {
Response<Object> response = new Response<>();
String name=file.getOriginalFilename();
- if(!name.substring(name.length()-4).equals(".xls") || !name.substring(name.length()-5).equals(".xlsx")){
+ if(!name.substring(name.length()-4).equals(".xls") && !name.substring(name.length()-5).equals(".xlsx")){
response.set(1,false,"鏂囦欢瑙ｆ瀽閿欒");
}else{
List<ProductBomApproving> list = service.excelParse(file.getInputStream());
--
Gitblit v1.9.1