From eb53aef53bdab3eb452b95276b575bb45e616316 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期五, 15 十二月 2023 14:17:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
index 68bef54..460c1d2 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
@@ -300,7 +300,7 @@
.eq(StringUtils.isNotBlank(pageWrap.getModel().getMemberType()),
Member::getType,
pageWrap.getModel().getMemberType())
- .eq(StringUtils.isNotBlank(pageWrap.getModel().getEventType()),
+ .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
CarEvent::getEventType,
pageWrap.getModel().getEventType())
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
--
Gitblit v1.9.3