From 3fd5e7962120c530d145b2d0571cd208d8720563 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 07 三月 2024 17:55:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 5bbd244..ab80e1c 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
@@ -277,10 +277,10 @@
VisitEvent::getEventType,
pageWrap.getModel().getEventType())
.ge(StringUtils.isNotBlank(pageWrap.getModel().getStartTime()),
- VisitEvent::getHappenTime,
+ VisitEvent::getCreateDate,
pageWrap.getModel().getStartTime())
.le(StringUtils.isNotBlank(pageWrap.getModel().getEndTime()),
- VisitEvent::getHappenTime,
+ VisitEvent::getCreateDate,
pageWrap.getModel().getEndTime())
.eq(VisitEvent::getIsdeleted,Constants.ZERO);
queryWrapper.orderByDesc(VisitEvent::getHappenTime);
--
Gitblit v1.9.3