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 9471d0c..45545de 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
@@ -184,6 +184,7 @@ public class CommonService {
                     .setFileName(folderName)
                     .setFileVersion(FILE_START_VERSION)
                     .setParentId(parentId)
+                    .setFileType("文件夹")
                     .setFileCode(createFileCode(parentId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr))
                     .setFileTime(nowTimeStr)
                     .setPrjDir(isPrjDir)
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 e912cc4..fe22891 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
@@ -1,5 +1,6 @@
 package com.electromagnetic.industry.software.manage.service.serviceimpl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.electromagnetic.industry.software.common.enums.FilePermission;
 import com.electromagnetic.industry.software.common.util.UserThreadLocal;
@@ -36,8 +37,8 @@ public class PermissionServiceImpl implements PermissionService {
 
         List<String> roleIds = getRoles(userId);
         // 只有当 roleIds 不为空且不为 null 时，才添加 in 条件
-        if (roleIds == null || roleIds.isEmpty()) {
-            return transToMap(new ArrayList<>());
+        if (CollUtil.isEmpty(roleIds)) {
+            return new HashMap<>();
         }
         LambdaQueryWrapper<RolePermission> queryWrapper1 = new LambdaQueryWrapper<>();
         queryWrapper1.select(RolePermission::getPermissionCode)