生成站点电路试验报告(天线)合并单元格

zss

2025-12-17 09101577baa4b844e308238d1d4ac1972d660577

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

@@ -47,6 +47,7 @@
    @Override
    public List<DepartmentDto> selectDepartment() {
        List<DepartmentDto> departments = departmentMapper.selectDepartment();
        departments.addAll(departmentMapper.selectCustomList());
        //获取父节点
        List<DepartmentDto> collect = departments.stream().filter(m -> m.getFatherId() == null).peek(
                (m) -> m.setChildren(getChildren(m, departments))
@@ -89,4 +90,8 @@
        return list;
    }

    @Override
    public List<Department> selectDepartmentEnum() {
        return departmentMapper.selectList(Wrappers.<Department>lambdaQuery().isNotNull(Department::getFatherId).select(Department::getId,Department::getName));
    }
}