From 6cfe0691d2c7e856ef8fd5e91d409f81473361b5 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Tue, 12 Aug 2025 09:59:55 +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 +-
 .../service/serviceimpl/FileTagRelationServiceImpl.java     | 2 +-
 .../manage/service/serviceimpl/PermissionServiceImpl.java   | 6 +-----
 .../industry/software/manage/tasks/BackupTask.java          | 3 +--
 4 files changed, 4 insertions(+), 9 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 642a274..f9a311e 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
@@ -695,7 +695,7 @@ public class CommonService {
                 fileName,
                 destPath,
                 strategyStr,
-                finalEdFileInfo.getFileName() + "." + suffix);
+                Optional.ofNullable(finalEdFileInfo).map(EdFileInfo::getFileName).orElse("") + "." + suffix);
         return ElectromagneticResultUtil.success(Optional.ofNullable(finalEdFileInfo).map(EdFileInfo::getId).orElse(""));
     }
 
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java
index a2d7bd1..f4f9810 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java
@@ -94,7 +94,7 @@ public class FileTagRelationServiceImpl extends ServiceImpl<FileTagRelationMappe
 
             EdFileInfo fileInfo = edFileInfoMapper.selectById(fileId);
             String dbPath = commonService.getDbPath(fileInfo.getFilePath());
-            UserThreadLocal.setSuccessInfo(Optional.ofNullable(fileInfo).map(EdFileInfo::getParentId).orElse(""), fileId, "添加了标签 {} 到文件 {}", tags, dbPath);
+            UserThreadLocal.setSuccessInfo(Optional.of(fileInfo).map(EdFileInfo::getParentId).orElse(""), fileId, "添加了标签 {} 到文件 {}", tags, dbPath);
         }
         return isSuccess;
     }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/PermissionServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/PermissionServiceImpl.java
index cb72a73..2cc5178 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/PermissionServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/PermissionServiceImpl.java
@@ -155,11 +155,7 @@ public class PermissionServiceImpl implements PermissionService {
             allCodes = FilePermission.getAllCodesExcludeView();
         }
         for (String code : allCodes) {
-            if (permissionCodes.contains(code)) {
-                result.put(code, true);
-            } else {
-                result.put(code, false);
-            }
+            result.put(code, permissionCodes.contains(code));
         }
         return result;
     }
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 92c3288..1c3db0f 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
@@ -245,7 +245,7 @@ public class BackupTask {
             }
 
             DateTime dateTime = DateUtil.offsetDay(DateUtil.date(), -1);
-            List<File> files = FileUtil.loopFiles(sqlScript, file -> file.lastModified() < dateTime.getTime());
+            List<File> files = FileUtil.loopFiles(elePropertyConfig.getSqlDirs(), file -> file.lastModified() < dateTime.getTime());
             files.forEach(file -> {
                 boolean deleteSuccess = file.delete();
                 String success = deleteSuccess ? "success" : "fail";
@@ -253,7 +253,6 @@ public class BackupTask {
                 log.info(msg);
             });
 
-
         } catch (Exception e) {
             log.warn("导出MySQL数据异常，原因 {}", e.getMessage(), e);
         }