From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
index 5e73a02..da0d1fa 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
@@ -15,6 +15,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -128,11 +129,15 @@
MPJLambdaWrapper<CustomerLog> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.selectAll(CustomerLog.class)
+ .selectAs(Member::getName,CustomerLog::getMemberName)
.leftJoin(Customer.class,Customer::getId,CustomerLog::getCostomerId)
.eq(CustomerLog::getIsdeleted, Constants.ZERO)
+ .leftJoin(Member.class,Member::getId,Customer::getMemberId)
.eq(Objects.nonNull(pageWrap.getModel().getType()),CustomerLog::getType, pageWrap.getModel().getType())
.eq(Objects.nonNull(pageWrap.getModel().getMemberId()),Customer::getMemberId, pageWrap.getModel().getMemberId());
-
+ if (pageWrap.getModel().getMemberId() != null) {
+ queryWrapper.eq(Customer::getMemberId, pageWrap.getModel().getMemberId());
+ }
if (pageWrap.getModel().getId() != null) {
queryWrapper.eq(CustomerLog::getId, pageWrap.getModel().getId());
}
@@ -234,9 +239,10 @@
PageData<CustomerLog> pageData = PageData.from(customerLogMapper.selectJoinPage(page,CustomerLog.class, queryWrapper));
for (CustomerLog customerLog:pageData.getRecords()) {
if(Objects.nonNull(pageWrap.getModel().getIsHiddenPhone())&& Constants.equalsInteger(pageWrap.getModel().getIsHiddenPhone(),Constants.ZERO)){
- customerLog.setPhone(
- customerLog.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")
- );
+ customerLog.setPhone(Constants.desensitizationPhone(customerLog.getPhone()));
+ if(Constants.equalsInteger(customerLog.getType(),Constants.TWO)&& StringUtils.isNotBlank(customerLog.getMemberName())){
+ customerLog.setName(customerLog.getMemberName());
+ }
}
}
return pageData;
--
Gitblit v1.9.3