用户角色重命名初步修改

2024-12-25 09:31:36 +08:00
parent 76649f264b
commit 32c6d745b6
92 changed files with 749 additions and 776 deletions
@@ -41,7 +41,7 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject
             .WhereIf(!string.IsNullOrEmpty(inQuery.Code), o => o.TrialCode.Contains(inQuery.Code))
             .WhereIf(!string.IsNullOrEmpty(inQuery.ResearchProgramNo), o => o.ResearchProgramNo.Contains(inQuery.ResearchProgramNo))
             .WhereIf(!string.IsNullOrWhiteSpace(inQuery.ExperimentName), o => o.ExperimentName.Contains(inQuery.ExperimentName))
-             .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id && t.IsDeleted == false) && t.IsDeleted == false)
+             .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.UserRoleId && t.IsDeleted == false) && t.IsDeleted == false)
             .Select(t => new TrialListDTO_UltrasonicDicom()
             {
                 TrialId = t.Id,
@@ -123,7 +123,7 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject

                            TrialSiteCode = dicomStudy.Subject.TrialSite.TrialSiteCode,

-                            Uploader = dicomStudy.CreateUser.UserName,
+                            Uploader = dicomStudy.CreateUserRole.UserName,

                            UploadTime = dicomStudy.CreateTime
                        };