diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/EdMetaObjectHandler.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/EdMetaObjectHandler.java
index a3952fd..032c859 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/EdMetaObjectHandler.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/EdMetaObjectHandler.java
@@ -29,7 +29,7 @@ public class EdMetaObjectHandler implements MetaObjectHandler {
             this.strictInsertFill(metaObject, "updatedAt", Date.class, new Date());
         }
         if (metaObject.hasGetter("createdBy")) {
-            this.setFieldValByName("createdBy", Optional.of(UserThreadLocal.getUserId()).orElse(""), metaObject);
+            this.setFieldValByName("createdBy", Optional.ofNullable(UserThreadLocal.getUserId()).orElse(""), metaObject);
         }
     }
 
@@ -45,7 +45,7 @@ public class EdMetaObjectHandler implements MetaObjectHandler {
             this.setFieldValByName("updatedTime", new Date(), metaObject);
         }
         if (metaObject.hasGetter("updatedBy")) {
-            this.setFieldValByName("updatedBy", Optional.of(UserThreadLocal.getUserId()).orElse(""), metaObject);
+            this.setFieldValByName("updatedBy", Optional.ofNullable(UserThreadLocal.getUserId()).orElse(""), metaObject);
         }
     }
 }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java
index 48fb8af..a7b9aa0 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java
@@ -46,7 +46,7 @@ public class EdFileRelationController {
     public ElectromagneticResult<?> updateRelation(@RequestBody UpdateRelationDTO updateRelation) {
         LambdaUpdateWrapper<EdFileRelation> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(EdFileRelation::getId, updateRelation.getRelationId()).set(EdFileRelation::getRelationship, updateRelation.getRelationship());
-        boolean isUpdated = edFileRelationService.update(wrapper);
+        boolean isUpdated = edFileRelationService.update(new EdFileRelation(), wrapper);
         if (isUpdated) {
             UserThreadLocal.setSuccessInfo("", updateRelation.getRelationId(), "更新了文件关系");
         }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
index 13b538b..d47de10 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
@@ -161,7 +161,7 @@ public class EdFileRelationServiceImpl extends ServiceImpl<EdFileRelationMapper,
         newEdFileInfo.newInit();
         // 首先检查是否是同名文件
         Assert.isTrue(EleCommonUtil.isFileNameValid(mainName + "." + suffix), NAME_VALID_MSG);
-        Long count = edFileInfoService.count(Wrappers.lambdaQuery(EdFileInfo.class)
+        long count = edFileInfoService.count(Wrappers.lambdaQuery(EdFileInfo.class)
                 .eq(EdFileInfo::getParentId, parentId)
                 .eq(EdFileInfo::getFileName, mainName)
                 .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java
index c8c1a66..ed744c5 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java
@@ -152,7 +152,7 @@ public class FileRecycleServiceImpl implements FileRecycleService {
                         .setFileName(saveFileName)
                         .setFileCode(commonService.getFileCode(fileSysPath))
                         .setFileCreateTime(edFileInfo.getCreatedTime())
-                        .setSource(FileBackupSource.SYS_BACKUP.code);
+                        .setSource(FileBackupSource.REMOVE.code);
 
                 if (backup.getBackupSuccess()) {
                     backupLog.setBackupSuccess(true);
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java
index ab6a5ff..ff88f2a 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java
@@ -112,16 +112,19 @@ public class BackupTask {
                     .setFileCreateTime(edFileInfo.getCreatedTime())
                     .setSource(FileBackupSource.SYS_BACKUP.code);
             fileBackupLogMapper.insert(backupLog);
-
         }
     }
 
     private Date getFileMaxCreateTime() {
-        List<FileBackupLog> fileBackupLogs = fileBackupLogMapper.selectList(Wrappers.<FileBackupLog>lambdaQuery().orderByDesc(FileBackupLog::getFileCreateTime).last("limit 1"));
+        List<FileBackupLog> fileBackupLogs = fileBackupLogMapper.selectList(Wrappers.<FileBackupLog>lambdaQuery()
+                .eq(FileBackupLog::getSource, FileBackupSource.SYS_BACKUP.code)
+                .orderByDesc(FileBackupLog::getFileCreateTime)
+                .last("limit 1"));
         if (CollUtil.isNotEmpty(fileBackupLogs)) {
             return fileBackupLogs.get(0).getFileCreateTime();
         }
-        return new Date();
+        // 此处先写一个魔鬼字段值
+        return DateUtil.parse("2000-1-1 01:00:00");
     }
 
     public List<String> getFailBackFile() {
diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/UserThreadLocal.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/UserThreadLocal.java
index 68615a4..15e5de6 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/UserThreadLocal.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/UserThreadLocal.java
@@ -25,8 +25,6 @@ public class UserThreadLocal {
     }
 
     public static String getUserId() {
-
-//        return "1876888149980930048";
         return userThread.get().getUserId();
     }