From 50bdd04fecd1c35d50cc160388b5cff368dc1f08 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 12 一月 2024 11:36:27 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/service/TechnicalSpecificationService.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/TechnicalSpecificationService.java b/src/main/java/com/whyc/service/TechnicalSpecificationService.java
index fe928e5..9b76a18 100644
--- a/src/main/java/com/whyc/service/TechnicalSpecificationService.java
+++ b/src/main/java/com/whyc/service/TechnicalSpecificationService.java
@@ -20,7 +20,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -128,11 +127,11 @@
return new Response().set(1,false,"鏂囦欢鍚�,鏂囦欢绫诲瀷,鐗堟湰,璐熻矗浜�,褰掓。鏃ユ湡,鐗╂枡缂栫爜,瑙勬牸鍨嬪彿 涓嚦灏戞湁涓�椤逛负绌�");
}
- //鏍￠獙瑙勬牸涔︽枃浠跺悕绉�=璇存槑涔︿腑鐨勬枃浠跺悕绉�+鐗堟湰鍙�
+ //鏍￠獙瑙勬牸涔﹂檮浠跺悕绉�=璇存槑涔︿腑鐨勬枃浠跺悕绉�+鐗堟湰鍙�
String fileNameUnion = specification.getFileName() + specification.getVersion();
- String excelName = file2Name.substring(0,file2Name.lastIndexOf("."));
- if(!(fileNameUnion).equals(excelName)){
- return new Response().set(1,false,"鎶�鏈鏍间功excel鐨勫懡鍚嶄笌excel鍐呯殑鏂囦欢鍚�+鐗堟湰鍙风О涓嶄竴鑷�");
+ String attachmentName = file1Name.substring(0,file1Name.lastIndexOf("."));
+ if(!(fileNameUnion).equals(attachmentName)){
+ return new Response().set(1,false,"闄勪欢鐨勫懡鍚嶄笌鎶�鏈鏍间功excel鍐呯殑鏂囦欢鍚�+鐗堟湰鍙风О涓嶄竴鑷�");
}
//鏍￠獙璐熻矗浜烘槸鍚﹀瓨鍦�
boolean checkExists = userService.checkExists(specification.getOwner());
--
Gitblit v1.9.1