MrShi
3 天以前 3b759ef71bb48f9bb6f8445770d20e8ea7921788
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -235,8 +235,10 @@
                .leftJoin(Member.class,Member::getId,Retention::getMemberId)
                .leftJoin(Member.class,Member::getId,Retention::getMemberId)
                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .leftJoin(Category.class,Category::getId,Retention::getCategoryId)
                .selectAs(Company::getCompanyNamePath,Retention::getCompanyName)
                .selectAs(Member::getName,Retention::getName)
                .selectAs(Category::getName,Retention::getCategoryName)
                .selectAs(Member::getPhone,Retention::getPhone)
                .selectAs(Member::getVisitCompanyName,Retention::getVisitCompanyName)
                .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w->{
@@ -266,7 +268,6 @@
        }
        return PageData.from(retentionIPage);
    }
    @Override
    public List<RetentionVo> findPageExcel(PageWrap<Retention> pageWrap) {