diff --git a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
index 7e9e3978..9446b249 100644
--- a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
+++ b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
@@ -398,11 +398,20 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
         if (ObjectUtils.isNotNull(minioFileSearchReq.getParentNodeId())) {
             // 项目节点下搜索文件
             FileMetadataInfo nodeMetadataInfo = fileMetadataInfoService.lambdaQuery().eq(FileMetadataInfo::getNodeId, minioFileSearchReq.getParentNodeId()).one();
-            dirObjectKey = nodeMetadataInfo.getObjectKey();
+            if(nodeMetadataInfo != null){
+                dirObjectKey = nodeMetadataInfo.getObjectKey();
+            }
+
         } else if (ObjectUtils.isNotNull(minioFileSearchReq.getParentDirId())) {
             // 知识库的文件查询
             FileMetadataInfo dirMetadataInfo = fileMetadataInfoService.getById(minioFileSearchReq.getParentDirId());
-            dirObjectKey = dirMetadataInfo.getObjectKey();
+            if(dirMetadataInfo != null){
+                dirObjectKey = dirMetadataInfo.getObjectKey();
+            }
+        }
+
+        if(dirObjectKey == null){
+            return SdmResponse.failed("历史目录不存在");
         }
 
         // 查询当前文件夹和子文件下的文件，使用 dirObjectKey%
diff --git a/system/src/main/java/com/sdm/system/model/entity/SysTenant.java b/system/src/main/java/com/sdm/system/model/entity/SysTenant.java
index 081d4bb5..0eb8cc5b 100644
--- a/system/src/main/java/com/sdm/system/model/entity/SysTenant.java
+++ b/system/src/main/java/com/sdm/system/model/entity/SysTenant.java
@@ -25,7 +25,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("sys_tenant")
-@ApiModel(value="Tenant对象", description="租户信息表")
+@ApiModel(value="SysTenant对象", description="租户信息表")
 public class SysTenant implements Serializable {
     private static final long serialVersionUID = 1L;