From d404864e22a98cf1a81177041a264ed31aa56222 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 13 十月 2026 08:14:59 +0800
Subject: [PATCH] fix: 更新查询逻辑以支持产品型号的批号匹配，调整配置文件以更改文件路径和数据库设置
---
src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 e5c05ed..baa8d02 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -239,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