From f350465db70d6f9db9494483ee0cec7793a9007b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 19 八月 2026 17:47:57 +0800
Subject: [PATCH] feat(approve): 实现审批流程或签会签功能并优化数据库配置

---
 src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 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..e0f3554 100644
--- a/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
+++ b/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
@@ -26,12 +26,21 @@
 
     @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;
+
+        wrapper.orderByDesc(CustomerVisits::getPurposeDate);
+
+        return customerVisitsMapper.selectPage(page, wrapper);
     }
 
     @Override

--
Gitblit v1.9.3