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

@@ -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/Service/TrialSiteUser/DTO/UserTrialViewModel.cs

@@ -94,15 +94,6 @@ 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<TrialIdentityUserBasicInfo>> GetTrialUserList(Guid trialId)
+        public async Task<List<TrialUserBasicInfo>> GetTrialUserList(Guid trialId)
         {
-            return await _trialIdentityUserRepository.Where(t => t.TrialId == trialId, ignoreQueryFilters: true)
+            return await _trialUseRoleRepository.Where(t => t.TrialId == trialId, ignoreQueryFilters: true)
-                  .Select(t => new TrialIdentityUserBasicInfo() { FullName = t.IdentityUser.FullName, IdentityUserId = t.IdentityUserId, UserName = t.IdentityUser.UserName })
+                  .Select(t => new TrialUserBasicInfo() { FullName = t.UserRole.FullName, UserId = t.UserId, UserTypeId = t.UserRole.UserTypeId, UserName = t.UserRole.IdentityUser.UserName })
                   .ToListAsync();
         }
 

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

@@ -22,12 +22,6 @@ namespace IRaCIS.Core.Application.Triggers.AfterSaveTrigger
             {
 
                 if (userlog.TargetIdentityUserId != null)
-                {
-
-                    //判断是否需要记录详情
-
-                    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()
                     {
@@ -54,9 +48,6 @@ namespace IRaCIS.Core.Application.Triggers.AfterSaveTrigger
 
 
                     userlog.JsonObj = obj.ToJsonStr();
-                    }
-
-
 
                 }