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();