From ff43266b93a07a132c13eda38f7b8b7bf328d6d8 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Wed, 10 Jul 2024 10:59:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/system/SysNoticeMapper.xml         | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysNoticeMapper.xml
index 6c2fe66a..c2828179 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -57,24 +57,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getList" resultType="com.bonus.sgzb.system.domain.SysNotice">
         SELECT
-            notice_id,
-            notice_title,
-            notice_type,
-            CAST( notice_content AS CHAR ) AS notice_content,
-            STATUS,
-            create_by,
-            create_time,
-            update_by,
-            update_time,
-            remark
+            sn.notice_id,
+            sn.notice_title,
+            sn.notice_type,
+            CAST( sn.notice_content AS CHAR ) AS notice_content,
+            sn.STATUS,
+            sn.create_by,
+            su.nick_name,
+            sn.create_time,
+            sn.update_by,
+            sn.update_time,
+            sn.remark
         FROM
-            sys_notice
+            sys_notice sn left join sys_user su on sn.create_by = su.user_name
         WHERE
             (
-            user_id IS NULL
-            OR user_id = ''
-            OR FIND_IN_SET(#{userId}, user_id) = 0
+            sn.user_id IS NULL
+            OR sn.user_id = ''
+            OR FIND_IN_SET(#{userId}, sn.user_id) = 0
                 )
+            AND su.user_id != #{userId}
     </select>
 
     <insert id="insertNotice" parameterType="com.bonus.sgzb.system.domain.SysNotice">

From 4e9dfa60cd88d0b5b6f7d37d9d9055623dec3538 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Wed, 10 Jul 2024 11:11:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E9=99=8D=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/system/SysNoticeMapper.xml         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysNoticeMapper.xml
index c2828179..8190170a 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -51,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="createBy != null and createBy != ''">
 				AND sn.create_by like concat('%', #{createBy}, '%')
 			</if>
+        order by sn.create_time desc
     </select>
     <select id="selectUserIdByNoticeId" resultType="java.lang.String">
         select user_id from sys_notice where notice_id = #{noticeId}