Merge remote-tracking branch 'origin/master'

zss

2024-07-26 ff4d45d57c3d1a1c8d4218dd83023cb7e4c34d7e

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