From bba8ad2013b5aa142fe10c7d3d6c01546514c930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Fri, 9 Jul 2021 16:22:23 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=85=AC=E5=91=8A=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E6=88=AA=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Api/Ewide.Core/Ewide.Core.xml                      |  5 -----
 .../Service/Notice/Dto/NoticeReceiveOutput.cs      |  7 ++-----
 Api/Ewide.Core/Service/Notice/SysNoticeService.cs  | 14 +++++++-------
 web-react/src/views/main/_layout/header/notice.jsx |  4 ++--
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/Api/Ewide.Core/Ewide.Core.xml b/Api/Ewide.Core/Ewide.Core.xml
index bb4748b..8d6ebb4 100644
--- a/Api/Ewide.Core/Ewide.Core.xml
+++ b/Api/Ewide.Core/Ewide.Core.xml
@@ -5512,11 +5512,6 @@
             通知公告接收参数
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.NoticeReceiveOutput.Id">
-            <summary>
-            Id
-            </summary>
-        </member>
         <member name="P:Ewide.Core.Service.NoticeReceiveOutput.ReadStatus">
             <summary>
             阅读状态（字典 0未读 1已读）
diff --git a/Api/Ewide.Core/Service/Notice/Dto/NoticeReceiveOutput.cs b/Api/Ewide.Core/Service/Notice/Dto/NoticeReceiveOutput.cs
index 02e6810..c5a4e74 100644
--- a/Api/Ewide.Core/Service/Notice/Dto/NoticeReceiveOutput.cs
+++ b/Api/Ewide.Core/Service/Notice/Dto/NoticeReceiveOutput.cs
@@ -7,11 +7,6 @@ namespace Ewide.Core.Service
     /// </summary>
     public class NoticeReceiveOutput : NoticeBase
     {
-        /// <summary>
-        /// Id
-        /// </summary>
-        public long Id { get; set; }
-
         /// <summary>
         /// 阅读状态（字典 0未读 1已读）
         /// </summary>
@@ -21,5 +16,7 @@ namespace Ewide.Core.Service
         /// 阅读时间
         /// </summary>
         public DateTime ReadTime { get; set; }
+
+        public string Avatar { get; set; }
     }
 }
diff --git a/Api/Ewide.Core/Service/Notice/SysNoticeService.cs b/Api/Ewide.Core/Service/Notice/SysNoticeService.cs
index f524b42..3d422e3 100644
--- a/Api/Ewide.Core/Service/Notice/SysNoticeService.cs
+++ b/Api/Ewide.Core/Service/Notice/SysNoticeService.cs
@@ -217,7 +217,9 @@ namespace Ewide.Core.Service.Notice
         {
             var sql = @"SELECT 
 SN.*,
-SU.Avatar,SNU.ReadStatus
+SU.Avatar,
+SNU.ReadStatus,
+SNU.ReadTime
 FROM sys_notice SN 
 LEFT JOIN sys_notice_user SNU ON SN.Id = SNU.NoticeId
 LEFT JOIN sys_user SU ON SN.PublicUserId = SU.Id
@@ -231,16 +233,14 @@ WHERE SNU.UserId = @UserId AND SN.Status = @Status";
                     _userManager.UserId,
                     Status = (int)NoticeStatus.PUBLIC
                 },
-                new[]
-                {
-                    "Type","Title","ReadStatus"
-                }
+                new[] { "Type", "Title", "ReadStatus" }
             );
 
             data.Items = data.Items.Select(p =>
             {
-                var r = p.Adapt<dynamic>();
-                r.Content = Regex.Replace(r.Content, @"<\/?.+?\/?>", "").Replace("\r\n", "");
+                var r = p.Adapt<NoticeReceiveOutput>();
+                var content = Regex.Replace(r.Content, @"<\/?.+?\/?>|[\r\n]", "");
+                r.Content = content.Substring(0, content.Length > 50 ? 50 : content.Length);
                 return r;
             });
 
diff --git a/web-react/src/views/main/_layout/header/notice.jsx b/web-react/src/views/main/_layout/header/notice.jsx
index 37b8dab..ca020ed 100644
--- a/web-react/src/views/main/_layout/header/notice.jsx
+++ b/web-react/src/views/main/_layout/header/notice.jsx
@@ -54,7 +54,7 @@ export default class notice extends Component {
         } = await api.sysNoticeReceived({
             pageIndex,
             pageSize: 5,
-            sortField: 'createdTime',
+            sortField: 'publicTime',
             sortOrder: 'descend',
         })
         if (!items.length) {
@@ -109,7 +109,7 @@ export default class notice extends Component {
                                     </span>
                                 }
                             />
-                            <div className="ellipsis-3 text-gray">{item.content}</div>
+                            <div className="ellipsis-2 text-gray">{item.content}</div>
                         </List.Item>
                     )}
                 >