From 26be2660b19a0fafc28a41d8b9240ec833a667ef Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Fri, 28 Nov 2025 10:22:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/service/impl/DocumentScreenImpl.java      |  3 ++-
 .../resources/mapper/business/DocumentScreenMapper.xml | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java
index a6c43fd..b536064 100644
--- a/bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java
+++ b/bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java
@@ -1008,7 +1008,8 @@ public static String getZipPath(){
                 tbDocumentFolder.setRemark(vo2.getRemark());
                 tbDocumentFolder.setFilePath(vo2.getFilePath());
                 if("1".equals(vo2.getFileType())){
-                    //
+                    tbDocumentFolder.setFileSuffix(vo2.getFileSuffix());
+                    tbDocumentFolder.setLabels(vo2.getLabName());
                     // 获取后缀
                     int dotIndex = vo2.getName().lastIndexOf('.');
                     String extension = dotIndex > 0 ? vo2.getName().substring(dotIndex) : "";
diff --git a/bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml b/bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml
index 4afeeff..653ba07 100644
--- a/bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml
+++ b/bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml
@@ -212,7 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and INSTR(tpf.folder_name,#{keyWord}) > 0
             </if>
             <if test="labelIds!=null and labelIds!=''">
-                and  tpf.id='0000000';
+                and  tpf.id='0000000'
             </if>
             union ALL
             SELECT distinct
@@ -340,7 +340,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
     <select id="getList" resultType="com.bonus.business.domain.TbFolderFileVo">
-        select  id, folder_name as name,  file_type fileType, remark, file_path filePath,IFNULL(down_times,0)  downNum
+        select  id, folder_name as name,  file_type fileType, remark, file_path filePath,IFNULL(down_times,0)  downNum,
+        labels  labName,file_suffix fileSuffix
             from tb_user_document_folder
         where id in (
             <foreach collection="list" item="item" separator=",">
@@ -348,7 +349,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </foreach>
             )
         union ALL
-        select  tudf.id, tudf.folder_name as name,  tudf.file_type fileType, tudf.remark, tudf.file_path filePath,IFNULL(tudf.down_times,0)  downNum
+        select  tudf.id, tudf.folder_name as name,  tudf.file_type fileType, tudf.remark, tudf.file_path filePath,IFNULL(tudf.down_times,0)  downNum,
+        tudf.labels  labName,tudf.file_suffix fileSuffix
         from tb_user_document_folder tudf
         LEFT JOIN tb_public_real_user tpru on tpru.user_folder_id=tudf.id
         where tpru.public_folder_id in (
@@ -370,7 +372,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--查询子数据-->
     <select id="getChilderList" resultType="com.bonus.business.domain.TbFolderFileVo">
         select  id, folder_name as name, parent_id parentId,  file_type fileType, parent_ids parentIds, file_path filePath,
-                #{newId} newParentId,labels labName,
+                #{newId} newParentId,labels labName,file_suffix fileSuffix,
                 IFNULL(down_times,0) downNum,  0 readNum
         from tb_user_document_folder
         where parent_id=#{id}