From b613b1c082f646e5de9a88ea3f072ad9c5cf898e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 07 三月 2024 17:52:29 +0800
Subject: [PATCH] ERP接口

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index 4ab1ef6..dcbcda9 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/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);

--
Gitblit v1.9.3