From 5a5df7b6529a62233bd2541a9abbb7bd588e9a4d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 十二月 2025 17:54:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hckx' into hckx
---
src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml b/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml
index 5f646ad..cc65841 100644
--- a/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml
+++ b/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml
@@ -16,6 +16,9 @@
<if test="ew.status != null">
and n.status = #{ew.status}
</if>
+ <if test="ew.currentDate != null">
+ and n.expiration_date >= DATE_FORMAT(#{ew.currentDate},'%Y-%m-%d')
+ </if>
</where>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3