代码提交

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

@@ -82,26 +82,20 @@ public class TreeBuilder {
     }
 
     public static List<SysDept> buildDeptTree(List<SysDept> list) {
-        // 过滤已删除的数据（del_flag = '0' 表示已删除）
-        List<SysDept> validList = list.stream()
-                .filter(item -> "0".equals(item.getDelFlag()))
-                .filter(item -> "0".equals(item.getStatus()))
-                .collect(Collectors.toList());
-
         // 使用 Map 提升查找效率
         Map<Long, SysDept> map = new HashMap<>();
         List<SysDept> 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);

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());

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>
 	<select id="getDeptSelect" resultType="com.bonus.common.core.domain.entity.SysDept">
-		SELECT
+        SELECT dept_id   AS deptId,
-			dept_id           AS deptId,
+               parent_id AS parentId,
-			parent_id         AS parentId,
+               ancestors,
-			ancestors,
+               dept_name AS deptName,
-			dept_name         AS deptName,
+               order_num AS orderNum,
-			order_num         AS orderNum,
+               leader,
-			leader,
+               phone,
-			phone,
+               email,
-			email,
+               status,
-			status
+               del_flag  AS delFlag
-		FROM
+        FROM da_ky_sys_dept
-			da_ky_sys_dept
+        WHERE del_flag = '0'
-		WHERE
+          and status = '0'
-			del_flag = '0' and status = '0'
+    </select>
-	</select>
 
 </mapper>