From 27d8f8fbb2e02be63338b80f808969faa35adac0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 19 九月 2025 11:36:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/OaNotificationMapper.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/OaNotificationMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaNotificationMapper.xml
index 814196c..3caab6c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaNotificationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaNotificationMapper.xml
@@ -19,5 +19,21 @@
<sql id="Base_Column_List">
id, title, content, type, create_time, create_by, update_time, update_by, disabled
</sql>
+ <select id="pageList" resultType="com.ruoyi.system.vo.system.NotificationVO">
+ select * from oa_notification
+ where 1=1
+ <if test="query.title != null and query.title != ''">
+ and title like concat('%',#{query.title},'%')
+ </if>
+ <if test="deptIds != null and deptIds.size() > 0">
+ AND (
+ <foreach collection="deptIds" item="deptId" separator=" OR ">
+ FIND_IN_SET(#{deptId}, dept_ids)
+ </foreach>
+ )
+ </if>
+ AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ order by create_time desc
+ </select>
</mapper>
--
Gitblit v1.7.1