From 09361264d6d87b8ce57b61a26c5507dbc0a01031 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 28 八月 2026 23:16:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_玮苓乐器
---
src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
index 636130a..baa8d02 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
@@ -238,9 +238,9 @@
.or()
.eq(MeetApplication::getApplicationType, "notification");
});
- if (Objects.nonNull(vo.getMeetingDate())) {
+ if (Objects.nonNull(vo.getDate())) {
alWrapper.and(wrapper -> {
- wrapper.eq(MeetApplication::getMeetingDate, vo.getMeetingDate());
+ wrapper.eq(MeetApplication::getMeetingDate, vo.getDate());
});
}
alWrapper.orderByAsc(MeetApplication::getStartTime);
--
Gitblit v1.9.3