From 83ff46efc3526113e47010af23c9a9001ffdab73 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Fri, 7 Mar 2025 13:46:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../software/manage/service/serviceimpl/CommonService.java     | 2 +-
 .../manage/service/serviceimpl/EdFileInfoServiceImpl.java      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
index 2ea0c88..dc6475f 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
@@ -173,7 +173,7 @@ public class CommonService {
     }
 
     public String createFileCode(String parentId, String fileType, int version, String timeStr) {
-        if (fileType.equals(EleDataTypeEnum.FOLDER.desc)) {
+        if (fileType.equals(EleDataTypeEnum.FOLDER.desc) || StrUtil.isEmpty(fileType)) {
             return parentId + "00" + version + timeStr;
         }
         FileFormat fileFormat = fileFormatService.getBaseMapper().selectOne(Wrappers.lambdaQuery(FileFormat.class).eq(FileFormat::getSuffixName, fileType));
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index 9750616..c26f94b 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -1109,7 +1109,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             String destFilePath = commonService.getFileSysPath(destSaveFileInfo.getFilePath(), dataOwnCode);
             fileSystemService.copyFile(srcFilePath, destFilePath);
             return destSaveFileInfo;
-        } else if (strategy == FileRepeatEnum.NEW.code) {
+        } else {
             // 文件名加“_1”，版本号从100开始
             // 处理MySQL相关逻辑
             EdFileInfo newEdFileInfo = BeanUtil.copyProperties(srcFileInfo, EdFileInfo.class);
@@ -1128,7 +1128,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             fileSystemService.copyFile(srcFileSysPath, destFileSysPath);
             return newEdFileInfo;
         }
-        return null;
     }
 
     @Transactional(rollbackFor = Exception.class)