ll

liukangdong

2025-02-24 b94daf4ea357eafce26f37a1f0a799d55cbfa1a4

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java

@@ -55,8 +55,9 @@

    @Override
    public void deleteById(Integer id) {
        retentionMapper.update(null,new UpdateWrapper<Retention>().lambda().set(Retention::getIsdeleted,Constants.ONE).eq(Retention::getId,id));
//        retentionMapper.deleteById(id);
//        retentionMapper.update(null,new UpdateWrapper<Retention>().lambda().set(Retention::getIsdeleted,Constants.ONE)
//                .eq(Retention::getId,id));
        retentionMapper.deleteById(id);
    }

    @Override
@@ -231,8 +232,8 @@
                .selectAs(Member::getPhone,Retention::getPhone)
                .selectAs(Member::getVisitCompanyName,Retention::getVisitCompanyName)
                .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w->{
                    w.like( Retention::getPhone,pageWrap.getModel().getKeyWords())
                            .or().like( Retention::getName,pageWrap.getModel().getKeyWords()); })
                    w.like( Member::getPhone,pageWrap.getModel().getKeyWords())
                            .or().like( Member::getName,pageWrap.getModel().getKeyWords()); })
                .eq(Retention::getType,3)
                .eq(Retention::getIsdeleted,Constants.ZERO)
                .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),