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 18:20:45 +08:00
parent 73d0e54a58
commit b50ae31537
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-admin/src/main/java/com/bonus/web/controller/archive/FileManagementController.java
View File

@ -114,7 +114,7 @@ public class FileManagementController extends BaseController {
if (dto.getParentId().equals("0")) {
return getDataTable(new ArrayList<>());
} else {
Integer level = fileManageMapper.getLevelById(dto.getParentId());
Integer level = fileManageMapper.getLevelById(dto);
if (level == 4) {
startPage();
List<DaKyProFilesContentsDto> list = fileManageService.FileManage(dto);

4
bonus-admin/src/main/java/com/bonus/web/controller/tool/TreeBuilder.java
View File

@ -36,7 +36,7 @@ public class TreeBuilder {
for (ArchivalCatalogueDto item : validList) {
Integer parentId = item.getParentId();
// 如果 parent_id 为 null，则为根节点
if (parentId == null) {
if (parentId == null || parentId.equals("") || parentId.equals("0")) {
roots.add(item);
} else {
ArchivalCatalogueDto parent = map.get(parentId);
@ -68,7 +68,7 @@ public class TreeBuilder {
for (DaKyProFilesContentsDto item : validList) {
String parentId = item.getParentId();
// 如果 parent_id 为 null，则为根节点
if (parentId == null) {
if (parentId == null || parentId.equals("") || parentId.equals("0")) {
roots.add(item);
} else {
DaKyProFilesContentsDto parent = map.get(parentId);

2
bonus-admin/src/main/java/com/bonus/web/mapper/FileManageMapper.java
View File

@ -38,7 +38,7 @@ public interface FileManageMapper {
Integer updateIntegrityStatus(DaKyProFilesContentsDto dto);
Integer getLevelById(String id);
Integer getLevelById(DaKyProFilesContentsDto dto);
Integer getMaxSort(DaKyProFilesContentsDto dto);

3
bonus-admin/src/main/java/com/bonus/web/service/impl/FileManageServiceImpl.java
View File

@ -112,7 +112,8 @@ public class FileManageServiceImpl implements FileManageService {
List<DaKyProFilesContentsDto> list = fileManageMapper.list(daKyProFilesContentsDto);
list.removeIf(dto -> "0".equals(dto.getIsUnique()) && dto.getLevel() != 1);
if (daKyProFilesContentsDto.getId() != null) {
Integer level = fileManageMapper.getLevelById(daKyProFilesContentsDto.getId());
daKyProFilesContentsDto.setParentId(daKyProFilesContentsDto.getId());
Integer level = fileManageMapper.getLevelById(daKyProFilesContentsDto);
for (Iterator<DaKyProFilesContentsDto> it = list.iterator(); it.hasNext(); ) {
DaKyProFilesContentsDto item = it.next();
if (level <= item.getLevel()) {

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

@ -214,7 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
da_ky_pro_files_contents dkp
WHERE
dkp.id = #{id}
dkp.id = #{parentId} and dkp.pro_id = #{proId}
</select>
<select id="getSortById" resultType="java.lang.Integer">
SELECT