修改日志

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; }

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

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

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