k94314517
2024-03-07 b613b1c082f646e5de9a88ea3f072ad9c5cf898e
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -72,6 +72,8 @@
        memberCard.setCreator(userInfo.getId());
        memberCard.setCreateDate(new Date());
        memberCard.setStatus(Constants.ONE);
        memberCard.setIsdeleted(Constants.ZERO);
        memberCard.setHkStatus(Constants.ZERO);
        memberCardMapper.insert(memberCard);
        dealMemberRoleEmpower(memberMapper.selectById(memberCard.getMemberId()));
        Member member = memberMapper.selectById(memberCard.getMemberId());
@@ -296,10 +298,12 @@
                    .selectAs(Member::getName,MemberCard::getMemberName)
                    .selectAs(Member::getPhone,MemberCard::getMemberPhone)
                    .selectAs(Member::getType,MemberCard::getMemberType)
                    .selectAs(Company::getName,MemberCard::getCompanyName);
                    .selectAs(Company::getName,MemberCard::getCompanyName)
                    .eq(MemberCard::getIsdeleted,Constants.ZERO);
        queryWrapper.like(Objects.nonNull(pageWrap.getModel().getCode()),MemberCard::getCode,pageWrap.getModel().getCode())
                    .eq(Objects.nonNull(pageWrap.getModel().getStatus()),MemberCard::getStatus,pageWrap.getModel().getStatus())
                    .eq(Objects.nonNull(pageWrap.getModel().getStatus()),MemberCard::getStatus,pageWrap.getModel().getStatus())
                .   eq(Objects.nonNull(pageWrap.getModel().getMemberType()),Member::getType,pageWrap.getModel().getMemberType())
                    .like(number,Member::getPhone,pageWrap.getModel().getKeyword())
                    .like((b||hasWord),Member::getName,pageWrap.getModel().getKeyword());
        IPage<MemberCard> memberCardIPage = memberCardJoinMapper.selectJoinPage(page, MemberCard.class,queryWrapper);