Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -51,30 +51,33 @@ 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}
     </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">