diff --git a/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java b/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java
index 844ebc10..f95c6963 100644
--- a/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java
+++ b/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java
@@ -491,6 +491,8 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
             archiveRecordInfo.setStatus("0");//预导入状态
             archiveRecordInfo.setUpdateTime(DateUtils.getNowDate());
             archiveRecordInfo.setCreateTime(DateUtils.getNowDate());
+            //基地档案按照档号分类查询
+            archiveRecordInfo.setYear(archiveRecordInfo.getFileNum().split("-")[0]);
             list.add(archiveRecordInfo);
         }
         Map<String, ArchiveRecordInfo> stringArchiveRecordInfoMap = batchSaveRecordInfoList(list);
diff --git a/ruoyi-archives/target/classes/com/ruoyi/archives/mapper/ArchiveCategoryInfoMapper.class b/ruoyi-archives/target/classes/com/ruoyi/archives/mapper/ArchiveCategoryInfoMapper.class
index 48e3349f..84d78138 100644
Binary files a/ruoyi-archives/target/classes/com/ruoyi/archives/mapper/ArchiveCategoryInfoMapper.class and b/ruoyi-archives/target/classes/com/ruoyi/archives/mapper/ArchiveCategoryInfoMapper.class differ
diff --git a/ruoyi-archives/target/classes/mapper/archives/ArchiveCategoryInfoMapper.xml b/ruoyi-archives/target/classes/mapper/archives/ArchiveCategoryInfoMapper.xml
index f1182735..41341bb7 100644
--- a/ruoyi-archives/target/classes/mapper/archives/ArchiveCategoryInfoMapper.xml
+++ b/ruoyi-archives/target/classes/mapper/archives/ArchiveCategoryInfoMapper.xml
@@ -149,18 +149,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectFileNumGroupByCategory" resultType="com.ruoyi.archives.domain.ArchiveRecordInfo">
-    select
-        distinct archive_category as archiveCategory,
-        file_num as year
-    from
-        "PUBLIC"."archive_record_info"
-    where
-        archiveCategory = 'JJ'
-    group by
-        archive_category,
-        file_num
-    order by
-        archive_category,
-        file_num
+     SELECT ARCHIVE_CATEGORY as archiveCategory,file_num as fileNum
+     FROM (
+                SELECT
+                ARCHIVE_CATEGORY,
+                SPLIT_PART(file_num, '-', #{index}) AS file_num
+                from
+                "PUBLIC"."archive_record_info"
+                where
+                "PUBLIC"."archive_record_info"."ARCHIVE_CATEGORY" = #{recordCategory}
+    )RESULT
+    GROUP BY RESULT.ARCHIVE_CATEGORY,RESULT.file_num
+    ORDER BY RESULT.file_num
     </select>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-archives/target/classes/mapper/archives/ArchiveRecordInfoMapper.xml b/ruoyi-archives/target/classes/mapper/archives/ArchiveRecordInfoMapper.xml
index c5bf01e7..63c84b85 100644
--- a/ruoyi-archives/target/classes/mapper/archives/ArchiveRecordInfoMapper.xml
+++ b/ruoyi-archives/target/classes/mapper/archives/ArchiveRecordInfoMapper.xml
@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectArchiveRecordInfoList" parameterType="ArchiveRecordInfo" resultMap="ArchiveRecordInfoResult">
         <include refid="selectArchiveRecordInfoVo"/>
         <where>  
-            <if test="fileNum != null  and fileNum != ''"> and file_num = #{fileNum}</if>
+            <if test="fileNum != null  and fileNum != ''"> and file_num  like concat('%',#{fileNum}, '%')</if>
             <if test="totalNum != null  and totalNum != ''"> and total_num = #{totalNum}</if>
             <if test="boxNum != null  and boxNum != ''"> and box_num = #{boxNum}</if>
             <if test="caseNum != null  and caseNum != ''"> and case_num = #{caseNum}</if>