bonus
/
smart_archives_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码提交

This commit is contained in:
liang.chao 2025-09-18 17:55:48 +08:00
parent 5d24082373
commit 73d0e54a58
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java
View File

@ -58,6 +58,7 @@ public class ProjectServiceImpl implements ProjectService {
DaKyProFilesContentsDto dakyProFilesContentsDto = new DaKyProFilesContentsDto(); DaKyProFilesContentsDto dakyProFilesContentsDto = new DaKyProFilesContentsDto();
BeanUtils.copyProperties(archivalCatalogueDto, dakyProFilesContentsDto); BeanUtils.copyProperties(archivalCatalogueDto, dakyProFilesContentsDto);
dakyProFilesContentsDto.setId(archivalCatalogueDto.getId().toString()); dakyProFilesContentsDto.setId(archivalCatalogueDto.getId().toString());
dakyProFilesContentsDto.setParentId(archivalCatalogueDto.getParentId().toString());
dakyProFilesContentsDto.setCreateUserId(getLoginUser().getUserId()); dakyProFilesContentsDto.setCreateUserId(getLoginUser().getUserId());
dakyProFilesContentsDto.setCreateUserName(getLoginUser().getUsername()); dakyProFilesContentsDto.setCreateUserName(getLoginUser().getUsername());
dakyProFilesContentsDto.setProId(projectDto.getProId()); dakyProFilesContentsDto.setProId(projectDto.getProId());

15
bonus-admin/src/main/resources/mapper/FileManageMapper.xml
View File

@ -137,12 +137,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dkp.*, dkp.*,
COALESCE(dkp2.content_name, dkp.content_name) AS parentName COALESCE(dkp2.content_name, dkp.content_name) AS parentName
FROM FROM
da_ky_pro_files_contents dkp da_ky_pro_files_contents dkp
LEFT JOIN da_ky_pro_files_contents dkp2 on dkp.parent_id = dkp2.id LEFT JOIN da_ky_pro_files_contents dkp2
ON dkp.parent_id = dkp2.id
AND dkp2.del_flag = '1'
AND dkp2.pro_id = #{proId}
WHERE WHERE
dkp.del_flag = '1' and dkp.pro_id = #{proId} and dkp.level in (0,1,2,3,4) dkp.del_flag = '1'
AND dkp.pro_id = #{proId}
AND dkp.level IN (0,1,2,3,4)
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
and dkp.content_name like concat('%', #{keyWord}, '%') AND dkp.content_name LIKE CONCAT('%', #{keyWord}, '%')
</if> </if>
ORDER BY ORDER BY
dkp.`level`, dkp.sort dkp.`level`, dkp.sort
@ -172,7 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
da_ky_pro_files_contents dkpfc da_ky_pro_files_contents dkpfc
left join da_ky_sys_file_source dkfs on dkpfc.id = dkfs.business_id left join da_ky_sys_file_source dkfs on dkpfc.id = dkfs.business_id
WHERE WHERE
dkpfc.del_flag = '1' and dkpfc.parent_id = #{parentId} and dkpfc.level = 5 dkpfc.del_flag = '1' and dkpfc.parent_id = #{parentId} and dkpfc.pro_id = #{proId} and dkpfc.level = 5
<if test="contentName != null and contentName != ''"> <if test="contentName != null and contentName != ''">
and dkpfc.content_name like concat('%', #{contentName}, '%') and dkpfc.content_name like concat('%', #{contentName}, '%')
</if> </if>