From e9f2adb9ddc511c62e1628fbd527ba7cda8294d4 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 09 五月 2025 14:29:29 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index f522929..3dd42a9 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -2,12 +2,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.mapper.CustomerMapper;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.service.ICustomerService;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.LoginUser;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -15,6 +17,7 @@
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
@@ -49,11 +52,17 @@
@Override
public List<Customer> selectCustomerList(Customer customer) {
LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
- if (customer.getCustomerName() != null && !customer.getCustomerName().isEmpty()) {
+
+ if (StringUtils.isNotBlank(customer.getCustomerName())) {
queryWrapper.eq(Customer::getCustomerName, customer.getCustomerName());
}
+
List<Customer> customerList = customerMapper.selectList(queryWrapper);
- return customerList;
+
+ // 浣跨敤 Stream 淇敼姣忎釜 Customer 鐨� addressPhone 瀛楁
+ return customerList.stream().peek(c ->
+ c.setAddressPhone(c.getCompanyAddress() + "( " + c.getCompanyPhone() + " )")
+ ).collect(Collectors.toList());
}
/**
@@ -102,4 +111,11 @@
queryWrapper.in(Customer::getId, Arrays.asList(ids));
return customerMapper.selectList(queryWrapper);
}
+
+ @Override
+ public List customerList(Customer customer) {
+ LambdaQueryWrapper<Customer> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.select(Customer::getId, Customer::getCustomerName);
+ return customerMapper.selectMaps(queryWrapper);
+ }
}
--
Gitblit v1.9.3