修改查询

2024-12-27 11:32:17 +08:00
parent c06681f379
commit 7853614d2d
34 changed files with 237 additions and 165 deletions
@@ -144,7 +144,7 @@ namespace IRaCIS.Core.Application.Service

                var allUserTypeEnumList = toUserTypeEnumList.Union(copyUserTypeEnumList).Distinct().ToList();

-                var allUserList = await _trialUserRoleRepository.Where(t => t.TrialId == trialId && allUserTypeEnumList.Contains(t.UserRole.UserTypeEnum)).Select(t => new { t.UserId, t.UserRole.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum }).ToListAsync();
+                var allUserList = await _trialUserRoleRepository.Where(t => t.TrialId == trialId && allUserTypeEnumList.Contains(t.UserRole.UserTypeEnum)).Select(t => new { t.UserId, t.UserRole.IdentityUser.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum }).ToListAsync();


                var toUserList = allUserList.Where(t => toUserTypeEnumList.Contains(t.UserTypeEnum))
@@ -173,7 +173,7 @@ namespace IRaCIS.Core.Application.Services

                            ConfirmUserId = confirm.ConfirmUserId,
                            ConfirmTime = confirm.ConfirmTime,
-                            RealName = user.LastName + " / " + user.FirstName,
+                            RealName = user.FullName,
                            UserName = user.UserName,
                            UserTypeId = user.UserTypeId,
                            UserTypeShortName = user.UserTypeRole.UserTypeShortName
@@ -83,7 +83,7 @@ namespace IRaCIS.Core.Application.Services
                                        ConfirmUserId = confirm.ConfirmUserId,
                                        ConfirmTime = confirm.ConfirmTime,
                                        RealName = trialUser.UserRole.FullName,
-                                        UserName = trialUser.UserRole.UserName,
+                                        UserName = trialUser.UserRole.IdentityUser.UserName,
                                        UserTypeId = trialUser.UserRole.UserTypeId,
                                        UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName

@@ -247,7 +247,7 @@ namespace IRaCIS.Core.Application.Services
                                              ConfirmUserId = confirm.ConfirmUserId,
                                              ConfirmTime = confirm.ConfirmTime,
                                              RealName = trialUser.UserRole.FullName,
-                                              UserName = trialUser.UserRole.UserName,
+                                              UserName = trialUser.UserRole.IdentityUser.UserName,
                                              UserTypeId = trialUser.UserRole.UserTypeId,
                                              UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName
                                          };
@@ -279,7 +279,7 @@ namespace IRaCIS.Core.Application.Services
                                        ConfirmUserId = confirm.ConfirmUserId,
                                        ConfirmTime = confirm.ConfirmTime,
                                        RealName = trialUser.UserRole.FullName,
-                                        UserName = trialUser.UserRole.UserName,
+                                        UserName = trialUser.UserRole.IdentityUser.UserName,
                                        UserTypeId = trialUser.UserRole.UserTypeId,
                                        UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName

@@ -418,7 +418,7 @@ namespace IRaCIS.Core.Application.Services
                                    ConfirmUserId = confirm.ConfirmUserId,
                                    ConfirmTime = confirm.ConfirmTime,
                                    RealName = trialUser.UserRole.FullName,
-                                    UserName = trialUser.UserRole.UserName,
+                                    UserName = trialUser.UserRole.IdentityUser.UserName,
                                    UserTypeId = trialUser.UserRole.UserTypeId,
                                    UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName,

@@ -452,7 +452,7 @@ namespace IRaCIS.Core.Application.Services
                                     ConfirmUserId = confirm.ConfirmUserId,
                                     ConfirmTime = confirm.ConfirmTime,
                                     RealName = trialUser.UserRole.FullName,
-                                     UserName = trialUser.UserRole.UserName,
+                                     UserName = trialUser.UserRole.IdentityUser.UserName,
                                     UserTypeId = trialUser.UserRole.UserTypeId,
                                     UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName,

@@ -493,7 +493,7 @@ namespace IRaCIS.Core.Application.Services
        public async Task<List<TrialUserDto>> GetTrialUserSelect(Guid trialId)
        {
            return await _trialUserRoleRepository.Where(t => t.TrialId == trialId)
-                .Select(t => new TrialUserDto() { UserId = t.UserId, RealName = t.UserRole.FullName, UserName = t.UserRole.UserName })
+                .Select(t => new TrialUserDto() { UserId = t.UserId, RealName = t.UserRole.FullName, UserName = t.UserRole.IdentityUser.UserName })
                   .ToListAsync();
        }

@@ -778,7 +778,7 @@ namespace IRaCIS.Core.Application.Services
                  .Select(t => new TrialUserUnionDocumentView()
                  {
                      UserId = t.UserId,
-                      UserName = t.UserRole.UserName,
+                      UserName = t.UserRole.IdentityUser.UserName,
                      RealName = t.UserRole.FullName,
                      UserTypeShortName = t.UserRole.UserTypeRole.UserTypeShortName,
                      TrialDocumentCount = t.Trial.TrialDocumentList.Count(u => u.NeedConfirmedUserTypeList.Any(k => k.NeedConfirmUserTypeId == t.UserRole.UserTypeId)),
@@ -1226,7 +1226,7 @@ namespace IRaCIS.Core.Application.Service
                .Select(t => new TrialSelectUser()
                {
                    UserId = t.UserId,
-                    UserName = t.UserRole.UserName,
+                    UserName = t.UserRole.IdentityUser.UserName,
                    RealName = t.UserRole.FullName,
                    UserTypeEnum = t.UserRole.UserTypeEnum
                }).Distinct();