From e8158d16a13c2ea1f2d8566578137db4394ab610 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 28 三月 2024 18:36:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
index ab80e1c..a004435 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
@@ -269,7 +269,10 @@
pageWrap.getModel().getKeyWords())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
VisitEvent::getCarNo,
- pageWrap.getModel().getKeyWords())
+ pageWrap.getModel().getCarNo())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getVisitorWorkUint()),
+ VisitEvent::getVisitorWorkUint,
+ pageWrap.getModel().getVisitorWorkUint())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
Company::getName,
pageWrap.getModel().getCompanyName())
--
Gitblit v1.9.3