From c76a3b1194f320bf84061676d14200f7e78f044e Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 29 八月 2025 17:51:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml b/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml
new file mode 100644
index 0000000..5f646ad
--- /dev/null
+++ b/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.collaborativeApproval.mapper.NoticeMapper">
+
+    <select id="listPage" resultType="com.ruoyi.collaborativeApproval.dto.NoticeDTO">
+        select n.*, su.user_name as create_user_name
+        from notice n
+        left join sys_user su on n.create_user = su.user_id
+        <where>
+            <if test="ew.title != null and ew.title != ''">
+                and n.title like concat('%',#{ew.title},'%')
+            </if>
+            <if test="ew.type != null">
+                and n.type = #{ew.type}
+            </if>
+            <if test="ew.status != null">
+                and n.status = #{ew.status}
+            </if>
+        </where>
+    </select>
+</mapper>
\ No newline at end of file

--
Gitblit v1.9.3