From acb1a535f7df6f943159e13e5199a705f7e98074 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 18 七月 2024 17:07:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 2980e07..0abb8e5 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
@@ -233,9 +233,11 @@
queryWrapper.orderByDesc(CustomerLog::getCreateDate);
PageData<CustomerLog> pageData = PageData.from(customerLogMapper.selectJoinPage(page,CustomerLog.class, queryWrapper));
for (CustomerLog customerLog:pageData.getRecords()) {
- customerLog.setPhone(
- customerLog.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")
- );
+ if(Objects.nonNull(pageWrap.getModel().getMemberId())){
+ customerLog.setPhone(
+ customerLog.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")
+ );
+ }
}
return pageData;
}
--
Gitblit v1.9.3