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 == inQuery.RoleName)
+                 .WhereIf(!inQuery.RoleName.IsNullOrEmpty(), x => x.RoleName.Contains(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/Triggers/AfterSaveTrigger/UserLogAfterTrigger.cs

@@ -23,40 +23,31 @@ 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)
                     {
-                        var obj = await _identityUserRepository.Where(t => t.Id == userlog.TargetIdentityUserId).Select(t => new UserLogJsonObj()
+                        DepartmentName = t.DepartmentName,
+                        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()
                         {
-                            DepartmentName = t.DepartmentName,
+                            IsUserRoleDisabled = t.IsUserRoleDisabled,
-                            EMail = t.EMail,
+                            UserTypeEnum = t.UserTypeEnum,
-                            FirstName = t.FirstName,
+                            UserTypeShortName = t.UserTypeRole.UserTypeShortName
-                            LastName = t.LastName,
+                        }).ToList()
-                            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();
-                    }
-
-
 
                 }