From 6b9feca8656f0170be67d95d6b6af226dbe76c3f Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 26 Dec 2024 16:48:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Management/DTO/UserLogViewModel.cs      |  1 +
 .../Service/Management/UserService.cs               |  2 +-
 .../Service/Management/_MapConfig.cs                |  1 +
 .../AfterSaveTrigger/UserLogAfterTrigger.cs         | 13 +++++++++++--
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
index bfad70938..5858be3db 100644
--- a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
@@ -17,6 +17,7 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string? ActionUserName { get; set; }
 
+        public string ActionUserRoleShortName { get; set; }
 
         public DateTime CreateTime { get; set; }
         public Guid CreateUserId { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index e14cb3801..60822a9d9 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -1130,7 +1130,7 @@ namespace IRaCIS.Core.Application.Service
                 IsZhiZhun = t.IdentityUser.IsZhiZhun,
                 FullName = t.IdentityUser.FullName,
                 PermissionStr = t.UserTypeRole.PermissionStr,
-                UserName = t.UserName,
+                UserName = t.IdentityUser.UserName,
                 UserTypeShortName = t.UserTypeRole.UserTypeShortName,
             }).FirstOrDefaultAsync();
 
diff --git a/IRaCIS.Core.Application/Service/Management/_MapConfig.cs b/IRaCIS.Core.Application/Service/Management/_MapConfig.cs
index a06bade30..47a4784be 100644
--- a/IRaCIS.Core.Application/Service/Management/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Management/_MapConfig.cs
@@ -123,6 +123,7 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<UserLog, UserLogView>()
+                .ForMember(d => d.ActionUserRoleShortName, c => c.MapFrom(t => t.CreateUserRole.UserTypeRole.UserTypeShortName))
                 .ForMember(d => d.TargetIdentityUserName, c => c.MapFrom(t => t.TargetIdentityUser.UserName));
 
 
diff --git a/IRaCIS.Core.Application/Triggers/AfterSaveTrigger/UserLogAfterTrigger.cs b/IRaCIS.Core.Application/Triggers/AfterSaveTrigger/UserLogAfterTrigger.cs
index faf76a78d..ce19b7e24 100644
--- a/IRaCIS.Core.Application/Triggers/AfterSaveTrigger/UserLogAfterTrigger.cs
+++ b/IRaCIS.Core.Application/Triggers/AfterSaveTrigger/UserLogAfterTrigger.cs
@@ -41,11 +41,20 @@ namespace IRaCIS.Core.Application.Triggers.AfterSaveTrigger
 
                     }).FirstOrDefaultAsync();
 
-                    userlog.JsonObj =  obj.ToJsonStr();
 
-                    await _identityUserRepository.SaveChangesAsync();
+
+                    userlog.JsonObj = obj.ToJsonStr();
+
                 }
 
+                if (userlog.ActionIdentityUserId != null && userlog.ActionUserName.IsNullOrWhiteSpace())
+                {
+                    userlog.ActionUserName = await _identityUserRepository.Where(t => t.Id == userlog.ActionIdentityUserId).Select(t => t.UserName).FirstOrDefaultAsync();
+                }
+
+                await _identityUserRepository.SaveChangesAsync();
+
+
             }
         }
     }