baizonghao
2023-03-18 49c3bb0fc7875bb0c1f231a958fafc6a732fea40
ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
@@ -145,17 +145,19 @@
        List<UmsDepart> umsDeparts = sccgDepartMapper.selectDepartList();
        List<UmsDepartDto> res = umsDeparts
                .stream()
                .map(umsDepart -> {
                .map(item -> {
                    UmsDepartDto umsDepartDto = new UmsDepartDto();
                    umsDepartDto.setId(umsDepart.getId());
                    umsDepartDto.setDepartType(umsDepart.getDepartType());
                    UmsDepart umsDepartFather = sccgDepartMapper.selectOne(new LambdaQueryWrapper<UmsDepart>().eq(UmsDepart::getDepartName, umsDepart.getId()));
                    umsDepartDto.setId(item.getId());
                    umsDepartDto.setParentDepartName(item.getDepartName());
                    String departType = sccgDepartMapper.getDepartType(item.getDepartType());
                    umsDepartDto.setDepartType(departType);
                    UmsDepart umsDepartFather = sccgDepartMapper.selectOne(new LambdaQueryWrapper<UmsDepart>().eq(UmsDepart::getDepartName, item.getId()));
                    if (Objects.isNull(umsDepartFather)){
                        umsDepartDto.setParentDepartName("");
                    }else {
                        umsDepartDto.setParentDepartName(umsDepartFather.getDepartName());
                    }
                    umsDepartDto.setDepartDes(umsDepart.getDepartDes());
                    umsDepartDto.setDepartDes(item.getDepartDes());
                    return umsDepartDto;
                }).collect(Collectors.toList());
        return res;