diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/tool/TreeBuilder.java b/bonus-admin/src/main/java/com/bonus/web/controller/tool/TreeBuilder.java index 01e07b6..33ce142 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/tool/TreeBuilder.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/tool/TreeBuilder.java @@ -82,26 +82,20 @@ public class TreeBuilder { } public static List buildDeptTree(List list) { - // 过滤已删除的数据(del_flag = '0' 表示已删除) - List validList = list.stream() - .filter(item -> "0".equals(item.getDelFlag())) - .filter(item -> "0".equals(item.getStatus())) - .collect(Collectors.toList()); - // 使用 Map 提升查找效率 Map map = new HashMap<>(); List roots = new ArrayList<>(); // 第一步:将所有节点放入 map - for (SysDept item : validList) { + for (SysDept item : list) { map.put(item.getDeptId(), item); } // 第二步:构建父子关系 - for (SysDept item : validList) { + for (SysDept item : list) { Long parentId = item.getParentId(); // 如果 parent_id 为 null,则为根节点 - if (parentId == null) { + if (parentId == 0) { roots.add(item); } else { SysDept parent = map.get(parentId); 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 49880a7..262021e 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 @@ -57,6 +57,7 @@ public class ProjectServiceImpl implements ProjectService { for (ArchivalCatalogueDto archivalCatalogueDto : list) { DaKyProFilesContentsDto dakyProFilesContentsDto = new DaKyProFilesContentsDto(); BeanUtils.copyProperties(archivalCatalogueDto, dakyProFilesContentsDto); + dakyProFilesContentsDto.setId(archivalCatalogueDto.getId().toString()); dakyProFilesContentsDto.setCreateUserId(getLoginUser().getUserId()); dakyProFilesContentsDto.setCreateUserName(getLoginUser().getUsername()); dakyProFilesContentsDto.setProId(projectDto.getProId()); diff --git a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml index 7c66911..71c1ff2 100644 --- a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml +++ b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml @@ -342,20 +342,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dktf.transfer_apply_id = #{id} + SELECT dept_id AS deptId, + parent_id AS parentId, + ancestors, + dept_name AS deptName, + order_num AS orderNum, + leader, + phone, + email, + status, + del_flag AS delFlag + FROM da_ky_sys_dept + WHERE del_flag = '0' + and status = '0' +