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 - and tpf.id='0000000'; + and tpf.id='0000000' union ALL SELECT distinct @@ -340,7 +340,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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}