From e2d5bbcfa00601f1a7382d5382aae377066e91a7 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 18 May 2022 18:22:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Management/SystemNoticeService.cs             | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs b/IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs
index 93ab937e5..654f47d7e 100644
--- a/IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs
+++ b/IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs
@@ -65,19 +65,21 @@ namespace IRaCIS.Core.Application.Service
                 var systemNotice = (await _systemNoticeRepository.Where(t => t.Id == addOrEditSystemNotice.Id, true, true).Include(t => t.NoticeUserTypeList).FirstOrDefaultAsync()).IfNullThrowException();
 
 
+              
+
+                _mapper.Map(addOrEditSystemNotice, systemNotice);
+
                 if (addOrEditSystemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished && systemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.NotPublish)
                 {
                     systemNotice.PublishedUserId = _userInfo.Id;
                     systemNotice.PublishedTime = DateTime.Now;
                 }
-                else if(addOrEditSystemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.NotPublish && systemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished)
+                else if (addOrEditSystemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.NotPublish && systemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished)
                 {
                     systemNotice.PublishedUserId = null;
                     systemNotice.PublishedTime = null;
                 }
 
-                _mapper.Map(addOrEditSystemNotice, systemNotice);
-
 
                 await _systemNoticeRepository.SaveChangesAsync();