yangys
2024-05-19 9e5da8899bc21bb5b6b0a3c267108caa00199291
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/OrganizationServiceImpl.java
@@ -38,13 +38,13 @@
        this.commonGroupService = commonGroupService;
    }
    @Override // org.springblade.modules.cps.service.IOrganizationService
    public List<OrganizationDTO> selectList(OrganizationSelectVO organizationSelectVO) {
        List<OrganizationDTO> organizationList = this.organizationMapper.selectOrganizationList(organizationSelectVO);
        return calculateOrganizationPeopleNum(organizationList);
    }
    @Override // org.springblade.modules.cps.service.IOrganizationService
    @Transactional(rollbackFor = {Exception.class})
    public Boolean deleteOrganization(String ids, Integer type) {
        if (StatusType.REMOVE.getType().equals(type)) {
@@ -87,7 +87,7 @@
        return this.commonGroupService.changeStatus(Func.toLongList(ids), CommonConstant.DEACTIVATE);
    }
    @Override // org.springblade.modules.cps.service.IOrganizationService
    public List<OrganizationExcel> getExportOrganizationData(OrganizationSelectVO organizationSelectVO) {
        List<OrganizationDTO> list = selectList(organizationSelectVO);
        List<OrganizationVO> tree = ForestNodeMerger.merge(OrganizationConvert.INSTANCE.convert(list));