Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_建诚恒商贸

gaoluyang

7 天以前 a3d3ba426c2a5a6015888d5e32e0f9704b4d125c

 src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java

@@ -49,12 +49,12 @@

    @Override
    public IPage<AfterSalesServiceNewDto> listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
        Long tenantId = SecurityUtils.getLoginUser().getTenantId();
        SysDept sysDept = sysDeptMapper.selectDeptById(tenantId);
        //Long tenantId = SecurityUtils.getLoginUser().getTenantId();
        //SysDept sysDept = sysDeptMapper.selectDeptById(tenantId);
        IPage<AfterSalesServiceNewDto> afterSalesServiceIPage = afterSalesServiceMapper.listPage(page, afterSalesService);
        afterSalesServiceIPage.getRecords().forEach(item -> {
            item.setDeptName(sysDept.getDeptName());
        });
        //afterSalesServiceIPage.getRecords().forEach(item -> {
        //    item.setDeptName(sysDept.getDeptName());
        //});
        return afterSalesServiceIPage;
    }