代码提交

k94314517

2024-07-22 678115e978e2eac37874363d89d6db1d9a12f4ec

 server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java

@@ -132,7 +132,9 @@
                            .eq(CustomerLog::getIsdeleted, Constants.ZERO)
                .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());
        }
@@ -233,9 +235,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().getIsHiddenPhone())&& Constants.equalsInteger(pageWrap.getModel().getIsHiddenPhone(),Constants.ZERO)){
                customerLog.setPhone(
                        customerLog.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")
                );
            }
        }
        return pageData;
    }