用户登录日志 项目参与用户修改

IRaCIS.Core.Application/Service/Inspection/InspectionService.cs

@@ -106,7 +106,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
                             //OptType = data.OptType,
                             IP = data.IP,
                             Reason = data.Reason,
-                            IsSign = leftfrontAuditConfig.IsHaveSign && lefttrialSign.SignText!=null&& lefttrialSign.SignText!=string.Empty,
+                            IsSign = leftfrontAuditConfig.IsHaveSign && lefttrialSign.SignText != null && lefttrialSign.SignText != string.Empty,
                             SignId = data.SignId,
                             ParentId = data.ParentId,
                             ChildrenTypeId = data.ChildrenTypeId,
@@ -190,7 +190,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
 
                    .WhereIf(!inQuery.TaskName.IsNullOrEmpty(), x => x.TaskName.Contains(inQuery.TaskName) || x.BlindName.Contains(inQuery.TaskName))
                  .WhereIf(!inQuery.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(inQuery.SubjectInfo))
-                 .WhereIf(!inQuery.RoleName.IsNullOrEmpty(), x => x.RoleName.Contains(inQuery.RoleName))
+                 .WhereIf(!inQuery.RoleName.IsNullOrEmpty(), x => x.RoleName == inQuery.RoleName)
                  //.WhereIf(dto.VisitPlanInfo != null&& dto.VisitPlanInfo!=(decimal) 1.11, x => x.VisitNum == dto.VisitPlanInfo)
                  //.WhereIf(dto.VisitPlanInfo != (decimal)1.11,x=>x.InPlan!=null&& x.InPlan==false)
                  .WhereIf(inQuery.StartTime != null, x => x.CreateTime >= inQuery.StartTime)

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs

@@ -94,6 +94,15 @@ namespace IRaCIS.Application.Contracts
         public Guid UserId { get; set; }
     }
 
+    public class TrialIdentityUserBasicInfo
+    {
+        public Guid IdentityUserId { get; set; }
+
+        public string UserName { get; set; }
+
+        public string FullName { get; set; }
+    }
+
     public class TrialMaintenanceDTO : UserTrialCommand
     {
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs

@@ -21,10 +21,10 @@ namespace IRaCIS.Core.Application.Service
     {
 
         [HttpGet]
-        public async Task<List<TrialUserBasicInfo>> GetTrialUserList(Guid trialId)
+        public async Task<List<TrialIdentityUserBasicInfo>> GetTrialUserList(Guid trialId)
         {
-            return await _trialUseRoleRepository.Where(t => t.TrialId == trialId, ignoreQueryFilters: true)
+            return await _trialIdentityUserRepository.Where(t => t.TrialId == trialId, ignoreQueryFilters: true)
-                  .Select(t => new TrialUserBasicInfo() { FullName = t.UserRole.FullName, UserId = t.UserId, UserTypeId = t.UserRole.UserTypeId, UserName = t.UserRole.IdentityUser.UserName })
+                  .Select(t => new TrialIdentityUserBasicInfo() { FullName = t.IdentityUser.FullName, IdentityUserId = t.IdentityUserId, UserName = t.IdentityUser.UserName })
                   .ToListAsync();
         }
 

IRaCIS.Core.Application/Triggers/AfterSaveTrigger/UserLogAfterTrigger.cs

@@ -23,31 +23,40 @@ namespace IRaCIS.Core.Application.Triggers.AfterSaveTrigger
 
                 if (userlog.TargetIdentityUserId != null)
                 {
-                    var obj = await _identityUserRepository.Where(t => t.Id == userlog.TargetIdentityUserId).Select(t => new UserLogJsonObj()
+
+                    //判断是否需要记录详情
+
+                    if (userlog.OptType == UserOptType.AddUser || userlog.OptType == UserOptType.UpdateUser || userlog.OptType == UserOptType.UpdateUserRole
+                      || userlog.OptType == UserOptType.AccountEnable || userlog.OptType == UserOptType.AccountLocked)
                     {
-                        DepartmentName = t.DepartmentName,
+                        var obj = await _identityUserRepository.Where(t => t.Id == userlog.TargetIdentityUserId).Select(t => new UserLogJsonObj()
-                        EMail = t.EMail,
-                        FirstName = t.FirstName,
-                        LastName = t.LastName,
-                        OrganizationName = t.OrganizationName,
-                        Phone = t.Phone,
-                        PositionName = t.PositionName,
-                        Sex = t.Sex,
-                        Status = t.Status,
-                        UserCode = t.UserCode,
-                        UserName = t.UserName,
-                        UserRoleList = t.UserRoleList.Select(t => new UserRoleLogObj()
                         {
-                            IsUserRoleDisabled = t.IsUserRoleDisabled,
+                            DepartmentName = t.DepartmentName,
-                            UserTypeEnum = t.UserTypeEnum,
+                            EMail = t.EMail,
-                            UserTypeShortName = t.UserTypeRole.UserTypeShortName
+                            FirstName = t.FirstName,
-                        }).ToList()
+                            LastName = t.LastName,
+                            OrganizationName = t.OrganizationName,
+                            Phone = t.Phone,
+                            PositionName = t.PositionName,
+                            Sex = t.Sex,
+                            Status = t.Status,
+                            UserCode = t.UserCode,
+                            UserName = t.UserName,
+                            UserRoleList = t.UserRoleList.Select(t => new UserRoleLogObj()
+                            {
+                                IsUserRoleDisabled = t.IsUserRoleDisabled,
+                                UserTypeEnum = t.UserTypeEnum,
+                                UserTypeShortName = t.UserTypeRole.UserTypeShortName
+                            }).ToList()
 
-                    }).FirstOrDefaultAsync();
+                        }).FirstOrDefaultAsync();
 
 
 
-                    userlog.JsonObj = obj.ToJsonStr();
+                        userlog.JsonObj = obj.ToJsonStr();
+                    }
+
+
 
                 }