From b876358ff4c1fd0684b173a672e381345cfabe34 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 20 十二月 2023 11:43:25 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
index 4ff5d86..da81379 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
@@ -320,7 +320,7 @@
.eq(StringUtils.isNotBlank(pageWrap.getModel().getPersonType()),
Member::getType,
pageWrap.getModel().getPersonType())
- .eq(StringUtils.isNotBlank(pageWrap.getModel().getEventType()),
+ .eq( pageWrap.getModel().getEventType()!=null,
DeviceEvent::getEventType,
pageWrap.getModel().getEventType())
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
--
Gitblit v1.9.3