From 0527684883bc620febe0a1360f661cc2a7f16e00 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 29 十一月 2024 17:21:35 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 12428ac..f8c6d15 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1043,6 +1043,7 @@
loginUserInfo = member.getLoginUserInfo();
}
Member update = new Member();
+ update.setId(model.getId());
update.setEditDate(new Date());
update.setEditor(loginUserInfo.getId());
update.setStatus(member.getStatus());
@@ -2197,6 +2198,9 @@
Utils.MP.blankToNull(pageWrap.getModel());
Member model = pageWrap.getModel();
IPage iPage = memberMapper.selectJoinPage(page,Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .selectAs(YwCustomer::getName,Member::getCustomerName)
+ .leftJoin(YwCustomer.class,YwCustomer::getId,Member::getCustomerId)
.eq(Member::getIsdeleted,Constants.ZERO)
.eq(Member::getType,Constants.memberType.customer)
.eq(Objects.nonNull(model)&&Objects.nonNull(model.getCustomerId()),Member::getCustomerId,model.getCustomerId())
--
Gitblit v1.9.3