diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java
index fba5bb4..267572d 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java
@@ -1,6 +1,5 @@
 package com.electromagnetic.industry.software.manage.pojo.models;
 
-import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.electromagnetic.industry.software.common.enums.EffectFlagEnum;
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 05da72d..f6c0d35 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
@@ -429,7 +429,7 @@ public class CommonService {
         return map;
     }
 
-    public ElectromagneticResult<?> deleteFolder(String id, int dataOwnCode) {
+    public ElectromagneticResult<?> deleteFolder(String id) {
         // 如果文件夹下存在文件（包括文件夹和已经逻辑删除的文件），则不允许删除。后面管理员选择会有物理删除文件夹和文件的功能，此时MySQL和文件系统则会进行物理删除该文件。
         EdFileInfo srcFileInfo = edFileInfoMapper.selectById(id);
         Assert.isTrue(srcFileInfo.getDataType().equals(EleDataTypeEnum.FOLDER.code), "禁止删除目录");
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 8b38c39..43f513e 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
@@ -254,7 +254,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         EdFileInfo fileInfo = this.baseMapper.selectById(id);
         String dbPath = commonService.getDbPath(fileInfo.getFilePath());
         if (fileInfo.getDataType() == EleDataTypeEnum.FOLDER.code) {
-            ElectromagneticResult<?> res = commonService.deleteFolder(id, dataOwnCode);
+            ElectromagneticResult<?> res = commonService.deleteFolder(id);
             UserThreadLocal.setSuccessInfo(fileInfo.getParentId(), id, "作废目录 {} 成功，路径为 {}", fileInfo.getFileName(), dbPath);
             return res;
         }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
index 947d13e..fef3039 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
@@ -84,18 +84,16 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
         try {
             // 保存信息到MySQL
             String maxPrjId = this.baseMapper.maxPrjId();
-            int prjCount;
+            Long prjCount;
             DataOwnEnum enumByCode = DataOwnEnum.getEnumByCode(dataOwnCode);
+            LambdaQueryWrapper<EdFileInfo> qw = Wrappers.lambdaQuery(EdFileInfo.class).eq(EdFileInfo::getParentId, PRJ_PARENT_ID);
             switch (Objects.requireNonNull(enumByCode)) {
-                case USER_PRJ, USER_FILE -> prjCount = this.baseMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class).eq(EdFileInfo::getParentId, PRJ_PARENT_ID)
-                                .eq(EdFileInfo::getDataOwn, DataOwnEnum.USER_PRJ.code).eq(EdFileInfo::getCreatedBy, UserThreadLocal.getUserId()))
-                        .intValue();
-                case SYS_PRJ, SYS_FILE -> prjCount = this.baseMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class).eq(EdFileInfo::getParentId, PRJ_PARENT_ID)
-                                .eq(EdFileInfo::getDataOwn, DataOwnEnum.SYS_PRJ.code))
-                        .intValue();
-                case REPO_PRJ, REPO_FILE -> prjCount = this.baseMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class).eq(EdFileInfo::getParentId, PRJ_PARENT_ID)
-                                .eq(EdFileInfo::getDataOwn, DataOwnEnum.REPO_PRJ.code))
-                        .intValue();
+                case USER_PRJ, USER_FILE ->
+                        prjCount = this.baseMapper.selectCount(qw.eq(EdFileInfo::getDataOwn, DataOwnEnum.USER_PRJ.code).eq(EdFileInfo::getCreatedBy, UserThreadLocal.getUserId()));
+                case SYS_PRJ, SYS_FILE ->
+                        prjCount = this.baseMapper.selectCount(qw.eq(EdFileInfo::getDataOwn, DataOwnEnum.SYS_PRJ.code));
+                case REPO_PRJ, REPO_FILE ->
+                        prjCount = this.baseMapper.selectCount(qw.eq(EdFileInfo::getDataOwn, DataOwnEnum.REPO_PRJ.code));
                 default -> throw new BizException("参数错误");
             }
             int id = Integer.parseInt(StrUtil.isEmpty(maxPrjId) ? "100000" : maxPrjId);
@@ -115,7 +113,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
                     .setDataStatus(EleDataStatusEnum.NOT_PUBLISHED.code)
                     .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
                     .setFilePath(newPrjId)
-                    .setSort(++prjCount)
+                    .setSort(prjCount.intValue() + 1)
                     .setFileCode(commonService.createFileCode(newPrjId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr))
                     .setDataOwn(dataOwnCode)
                     .setEffectFlag(EffectFlagEnum.EFFECT.code);
@@ -163,8 +161,10 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
             String prjPath;
             DataOwnEnum enumByCode = DataOwnEnum.getEnumByCode(dataOwnCode);
             switch (Objects.requireNonNull(enumByCode)) {
-                case USER_PRJ, USER_FILE -> prjPath = commonService.getPrjRootPath1(dataOwnCode) + File.separator + UserThreadLocal.getUserId() + File.separator;
-                case REPO_PRJ, REPO_FILE, SYS_PRJ, SYS_FILE -> prjPath = commonService.getPrjRootPath1(dataOwnCode) + File.separator;
+                case USER_PRJ, USER_FILE ->
+                        prjPath = commonService.getPrjRootPath1(dataOwnCode) + File.separator + UserThreadLocal.getUserId() + File.separator;
+                case REPO_PRJ, REPO_FILE, SYS_PRJ, SYS_FILE ->
+                        prjPath = commonService.getPrjRootPath1(dataOwnCode) + File.separator;
                 default -> throw new BizException("参数错误");
             }
             fileSystemService.renameFile(prjPath, oldPrjName, newPrjName);
@@ -358,7 +358,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ElectromagneticResult<?> deleteFolder(String fileId, int dataOwnCode) {
-        return commonService.deleteFolder(fileId, dataOwnCode);
+        return commonService.deleteFolder(fileId);
     }
 
     /**