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 | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 319d478..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,26 +26,33 @@
@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());
+ }
}
- Page page1 = customerVisitsMapper.selectPage(page, customerVisitsLambdaQueryWrapper);
- return page1;
+
+ return customerVisitsMapper.selectPage(page, wrapper);
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean updateCustomerVisit(CustomerVisits customerVisits) {
if (customerVisits == null || customerVisits.getId() == null) {
- return false;
+ throw new RuntimeException("瀹㈡埛ID涓嶈兘涓虹┖");
}
if (StringUtils.isEmpty(customerVisits.getCustomerName())
|| StringUtils.isEmpty(customerVisits.getPurposeVisit())
|| StringUtils.isEmpty(customerVisits.getVisitAddress())
|| StringUtils.isEmpty(customerVisits.getPurposeDate())) {
- return false;
+ throw new RuntimeException("瀹㈡埛鍚嶇О銆佹嫓璁跨洰鐨勩�佹嫓璁垮湴鍧�銆佹嫓璁挎椂闂翠笉鑳戒负绌�");
}
return updateById(customerVisits);
--
Gitblit v1.9.3