From 1a3f5db043fd381b60a0a5f40687136274a2cbd1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 27 二月 2026 09:57:41 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New' into dev_New_kthg
---
src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java b/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
index d63fcb8..c36cf70 100644
--- a/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
+++ b/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
@@ -26,11 +26,19 @@
@Override
public IPage<CustomerVisits> listPage(Page page, CustomerVisits customerVisits) {
- LambdaQueryWrapper<CustomerVisits> customerVisitsLambdaQueryWrapper = new LambdaQueryWrapper<>();
- if (customerVisits != null && !StringUtils.isEmpty(customerVisits.getCustomerName())) {
- customerVisitsLambdaQueryWrapper.like(CustomerVisits::getCustomerName, customerVisits.getCustomerName());
+ LambdaQueryWrapper<CustomerVisits> wrapper = new LambdaQueryWrapper<>();
+
+ if (customerVisits != null) {
+ if (StringUtils.hasText(customerVisits.getCustomerName())) {
+ wrapper.like(CustomerVisits::getCustomerName, customerVisits.getCustomerName());
+ }
+
+ if (StringUtils.hasText(customerVisits.getVisitingPeople())) {
+ wrapper.like(CustomerVisits::getVisitingPeople, customerVisits.getVisitingPeople());
+ }
}
- return customerVisitsMapper.selectPage(page, customerVisitsLambdaQueryWrapper);
+
+ return customerVisitsMapper.selectPage(page, wrapper);
}
@Override
--
Gitblit v1.9.3