diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java
index 262021e..ee4988c 100644
--- a/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java
+++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java
@@ -58,6 +58,7 @@ public class ProjectServiceImpl implements ProjectService {
DaKyProFilesContentsDto dakyProFilesContentsDto = new DaKyProFilesContentsDto();
BeanUtils.copyProperties(archivalCatalogueDto, dakyProFilesContentsDto);
dakyProFilesContentsDto.setId(archivalCatalogueDto.getId().toString());
+ dakyProFilesContentsDto.setParentId(archivalCatalogueDto.getParentId().toString());
dakyProFilesContentsDto.setCreateUserId(getLoginUser().getUserId());
dakyProFilesContentsDto.setCreateUserName(getLoginUser().getUsername());
dakyProFilesContentsDto.setProId(projectDto.getProId());
diff --git a/bonus-admin/src/main/resources/mapper/FileManageMapper.xml b/bonus-admin/src/main/resources/mapper/FileManageMapper.xml
index 53d37c2..01ecd8a 100644
--- a/bonus-admin/src/main/resources/mapper/FileManageMapper.xml
+++ b/bonus-admin/src/main/resources/mapper/FileManageMapper.xml
@@ -137,12 +137,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dkp.*,
COALESCE(dkp2.content_name, dkp.content_name) AS parentName
FROM
- da_ky_pro_files_contents dkp
- LEFT JOIN da_ky_pro_files_contents dkp2 on dkp.parent_id = dkp2.id
+ da_ky_pro_files_contents dkp
+ 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
- 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)
- and dkp.content_name like concat('%', #{keyWord}, '%')
+ AND dkp.content_name LIKE CONCAT('%', #{keyWord}, '%')
ORDER BY
dkp.`level`, dkp.sort
@@ -172,7 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
da_ky_pro_files_contents dkpfc
left join da_ky_sys_file_source dkfs on dkpfc.id = dkfs.business_id
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
and dkpfc.content_name like concat('%', #{contentName}, '%')