修改bug
This commit is contained in:
parent
9f153a589f
commit
26be2660b1
|
|
@ -1008,7 +1008,8 @@ public static String getZipPath(){
|
||||||
tbDocumentFolder.setRemark(vo2.getRemark());
|
tbDocumentFolder.setRemark(vo2.getRemark());
|
||||||
tbDocumentFolder.setFilePath(vo2.getFilePath());
|
tbDocumentFolder.setFilePath(vo2.getFilePath());
|
||||||
if("1".equals(vo2.getFileType())){
|
if("1".equals(vo2.getFileType())){
|
||||||
//
|
tbDocumentFolder.setFileSuffix(vo2.getFileSuffix());
|
||||||
|
tbDocumentFolder.setLabels(vo2.getLabName());
|
||||||
// 获取后缀
|
// 获取后缀
|
||||||
int dotIndex = vo2.getName().lastIndexOf('.');
|
int dotIndex = vo2.getName().lastIndexOf('.');
|
||||||
String extension = dotIndex > 0 ? vo2.getName().substring(dotIndex) : "";
|
String extension = dotIndex > 0 ? vo2.getName().substring(dotIndex) : "";
|
||||||
|
|
|
||||||
|
|
@ -212,7 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
and INSTR(tpf.folder_name,#{keyWord}) > 0
|
and INSTR(tpf.folder_name,#{keyWord}) > 0
|
||||||
</if>
|
</if>
|
||||||
<if test="labelIds!=null and labelIds!=''">
|
<if test="labelIds!=null and labelIds!=''">
|
||||||
and tpf.id='0000000';
|
and tpf.id='0000000'
|
||||||
</if>
|
</if>
|
||||||
union ALL
|
union ALL
|
||||||
SELECT distinct
|
SELECT distinct
|
||||||
|
|
@ -340,7 +340,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
<select id="getList" resultType="com.bonus.business.domain.TbFolderFileVo">
|
<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
|
from tb_user_document_folder
|
||||||
where id in (
|
where id in (
|
||||||
<foreach collection="list" item="item" separator=",">
|
<foreach collection="list" item="item" separator=",">
|
||||||
|
|
@ -348,7 +349,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</foreach>
|
</foreach>
|
||||||
)
|
)
|
||||||
union ALL
|
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
|
from tb_user_document_folder tudf
|
||||||
LEFT JOIN tb_public_real_user tpru on tpru.user_folder_id=tudf.id
|
LEFT JOIN tb_public_real_user tpru on tpru.user_folder_id=tudf.id
|
||||||
where tpru.public_folder_id in (
|
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="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,
|
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
|
IFNULL(down_times,0) downNum, 0 readNum
|
||||||
from tb_user_document_folder
|
from tb_user_document_folder
|
||||||
where parent_id=#{id}
|
where parent_id=#{id}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue