Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
This commit is contained in:
+3
@@ -885,6 +885,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
|
|||||||
oSSFileList.addAll(deliverableTemplateFileList);
|
oSSFileList.addAll(deliverableTemplateFileList);
|
||||||
}
|
}
|
||||||
if(oSSFileList.size() != 0){
|
if(oSSFileList.size() != 0){
|
||||||
|
if(serialNumber.contains("/")){
|
||||||
|
serialNumber = serialNumber.replaceAll("/","-");
|
||||||
|
}
|
||||||
String fileNowPath = path + "/" + serialNumber;
|
String fileNowPath = path + "/" + serialNumber;
|
||||||
File file = new File(fileNowPath);
|
File file = new File(fileNowPath);
|
||||||
if (file.exists()) {
|
if (file.exists()) {
|
||||||
|
|||||||
+3
@@ -3991,6 +3991,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
|||||||
|
|
||||||
}
|
}
|
||||||
if(oSSFileList.size() != 0){
|
if(oSSFileList.size() != 0){
|
||||||
|
if(serialNumber.contains("/")){
|
||||||
|
serialNumber = serialNumber.replaceAll("/","-");
|
||||||
|
}
|
||||||
String fileNowPath = uploadpath + "/tempZip/" + serialNumber;
|
String fileNowPath = uploadpath + "/tempZip/" + serialNumber;
|
||||||
File file = new File(fileNowPath);
|
File file = new File(fileNowPath);
|
||||||
if (file.exists()) {
|
if (file.exists()) {
|
||||||
|
|||||||
+3
@@ -8366,6 +8366,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(oSSFileList.size() != 0){
|
if(oSSFileList.size() != 0){
|
||||||
|
if(serialNumber.contains("/")){
|
||||||
|
serialNumber = serialNumber.replaceAll("/","-");
|
||||||
|
}
|
||||||
String fileNowPath = uploadpath + "/tempZip/" + serialNumber;
|
String fileNowPath = uploadpath + "/tempZip/" + serialNumber;
|
||||||
File file = new File(fileNowPath);
|
File file = new File(fileNowPath);
|
||||||
if (file.exists()) {
|
if (file.exists()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user