From 0b7e2752b6f1e87084b837043291c890cca780a8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 15 十月 2025 19:11:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/OaNotificationMapper.xml | 17 +++++++++++++++++
1 files changed, 17 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 3caab6c..538d0f5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaNotificationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaNotificationMapper.xml
@@ -35,5 +35,22 @@
AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
order by create_time desc
</select>
+ <select id="pageListUser" resultType="com.ruoyi.system.vo.system.NotificationVO">
+ select t1.read_status as readStatus,t1.notification_id notificationId,t2.* from oa_notification t2
+ where 1=1
+ <if test="query.title != null and query.title != ''">
+ and t2.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}, t2.dept_ids)
+ </foreach>
+ )
+ </if>
+ and t1.user_id = #{query.userId}
+ AND t2.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ order by t1.id desc
+ </select>
</mapper>
--
Gitblit v1.7.1