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 d6f0bfd..5a39bac 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
@@ -224,7 +224,9 @@ public class CommonService {
 
             for (String id : ids) {
                 List<EdFileInfo> edFileInfos = selectAllAdminFolder(id);
-
+                if (!isAdminQuery) {
+                    edFileInfos = edFileInfos.stream().filter(e -> e.getDataStatus().equals(EleDataStatusEnum.PUBLISHED.code)).collect(Collectors.toList());
+                }
                 // 转换为树
                 TreeNodeConfig config = new TreeNodeConfig();
                 config.setIdKey(EdFileInfo.Fields.id);
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 acb22e5..1c3e8a9 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
@@ -393,11 +393,6 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
             String parentId = this.baseMapper.selectById(id).getParentId();
             // 首先检查同层是否有同名目录
             Assert.isTrue(commonService.notExistSameFolder(parentId, newFolderName));
-//            if (commonService.notExistSameFolder(parentId, newFolderName)) {
-//                String info = "存在同名子集，禁止修改";
-//                log.error(info);
-//                return ElectromagneticResultUtil.fail("-1", info);
-//            }
             String currentUserId = UserThreadLocal.getUserId();
             Date now = new Date();
             EdFileInfo fileInfo = this.baseMapper.selectOne(Wrappers.lambdaQuery(EdFileInfo.class)