From 3fd5e7962120c530d145b2d0571cd208d8720563 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 07 三月 2024 17:55:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 5 ++++-
1 files changed, 4 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 7e5c9e9..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,7 +298,8 @@
.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())
--
Gitblit v1.9.3