2024-4-22 资源要求-人员明细-bug修改

Crunchy

2024-04-22 a7a6a0c332f268010b4da0161cdee80acf9bc4ce

 cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java

@@ -17,6 +17,7 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import lombok.var;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -24,10 +25,7 @@
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.Wrapper;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -57,26 +55,24 @@
    //获取部门树
    @Override
    public List<DepartmentDto> selectDepartment() {
        List<Department> departments = departmentMapper.selectDepartment();
        // 假设 resultSet 是从数据库查询返回的结果集
        List<DepartmentDto> departmentDtos = new ArrayList<>();
        Map<Integer, DepartmentDto> departmentMap = new HashMap<>();
        List<DepartmentDto> departments = departmentMapper.selectDepartment();
        //获取父节点
        List<DepartmentDto> collect = departments.stream().filter(m -> m.getFatherId() == null).peek(
                (m) -> m.setChildren(getChildren(m, departments))
        ).collect(Collectors.toList());
        return collect;
    }

        for (Department department : departments) {
            DepartmentDto departmentDto = new DepartmentDto(department.getId(), department.getName(), department.getFatherId(), new ArrayList<DepartmentDto>());
            departmentMap.put(department.getId(), departmentDto);
            if (department.getFatherId() == null) {
                // 根部门
                departmentDtos.add(departmentDto);
            } else {
                // 将当前部门添加到父部门的 children 列表中
                DepartmentDto parent = departmentMap.get(department.getFatherId());
                if (parent != null) {
                    parent.getChildren().add(departmentDto);
                }
            }
        }
        return departmentDtos;
    /**
     * 递归查询子节点
     * @param root  根节点
     * @param all   所有节点
     * @return 根节点信息
     */
    private List<DepartmentDto> getChildren(DepartmentDto root, List<DepartmentDto> all) {
        return all.stream().filter(m -> Objects.equals(m.getFatherId(), root.getId())).peek(
                (m) -> m.setChildren(getChildren(m, all))
        ).collect(Collectors.toList());
    }

    //删除部门