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 bfc91cb..f64e125 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
@@ -656,7 +656,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             String fileTime = EleCommonUtil.getNowTimeStr();
             String codePathByDbPath = commonService.getCodePathByDbPath(destFolderInfo.getFilePath());
             String fileCode = commonService.createFileCode(codePathByDbPath, srcFileInfo.getFileType(), maxFileVersion + 1, fileTime);
-            EdFileInfo fileInfoTmp = sameFileInfos.get(0);
+            EdFileInfo fileInfoTmp = sameFileInfos.stream().filter(e -> e.getEffectFlag().equals(EffectFlagEnum.EFFECT.code)).findFirst().orElseThrow(RuntimeException::new);
             EdFileInfo destSaveFileInfo = BeanUtil.copyProperties(fileInfoTmp, EdFileInfo.class);
             destSaveFileInfo.setId(newFileDbId);
             destSaveFileInfo.setFileVersion(maxFileVersion + 1)
@@ -669,6 +669,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             String destFilePath = commonService.getFileSysPath(destSaveFileInfo.getFilePath());
             fileSystemService.moveFile(srcFilePath, destFilePath, true);
             this.baseMapper.deleteById(srcFileInfo.getId());
+            this.baseMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class)
+                    .set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)
+                    .eq(EdFileInfo::getId, fileInfoTmp.getId()));
         } else if (strategy == 3) {
             // 文件名加“_1”，版本号从100开始
             // 处理MySQL相关逻辑
@@ -694,15 +697,14 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         String srcFileDbPath = srcFileInfo.getFilePath();
         String fileCode = srcFileInfo.getFileCode();
         // 判断目标路径下是否有同名文件，如果所有的同名文件：1）如果所有文件都已经被作废，则该文件为新文件，版本号从100开始。2）如果有没有被作废的文件，则冲突处理方式按---1-跳过冲突文件 2-做版本更新 3-重命名，文件名加"_1"
-        List<EdFileInfo> effectFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
+        long count = this.baseMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class)
                 .eq(EdFileInfo::getParentId, targetFolderId)
                 .eq(EdFileInfo::getFileName, srcFileInfo.getFileName())
                 .eq(EdFileInfo::getFileType, srcFileInfo.getFileType())
                 .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code));
         EdFileInfo destFolderInfo = this.baseMapper.selectOne(Wrappers.lambdaQuery(EdFileInfo.class)
                 .eq(EdFileInfo::getId, targetFolderId));
-//        List<EdFileInfo> effectFileInfos = destFolderFiles.stream().filter(e -> Objects.equals(e.getEffectFlag(), EffectFlagEnum.EFFECT.code)).collect(Collectors.toList());
-        if (CollUtil.isEmpty(effectFileInfos)) {
+        if (count == 0) {
             // 没有同名文件
             // 首先将信息保存到MySQL
             String fileTime = EleCommonUtil.getNowTimeStr();