Compare commits

..

No commits in common. "91d5cbce169c598773f71e1bf94225ac3911310d" and "5d91ae815767a61c8422b1c17c99f99f2d87e5f8" have entirely different histories.

2 changed files with 2 additions and 12 deletions

View File

@ -98,9 +98,6 @@ namespace IRaCIS.Core.Application.Contracts
public bool IsDeleted { get; set; } public bool IsDeleted { get; set; }
public Guid UserTypeId { get; set; } public Guid UserTypeId { get; set; }
public string UserTypeShortName { get; set; } = string.Empty; public string UserTypeShortName { get; set; } = string.Empty;
public DateTime CreateTime { get; set; }
public DateTime UpdateTime { get; set; }
} }
public class UserTypeSimpleDTO public class UserTypeSimpleDTO

View File

@ -51,19 +51,12 @@ namespace IRaCIS.Core.Application.Service
IsDeleted = t.IsDeleted, IsDeleted = t.IsDeleted,
JoinTime = t.JoinTime, JoinTime = t.JoinTime,
RemoveTime = t.RemoveTime, RemoveTime = t.RemoveTime,
TrialUserRoleList = t.TrialUserRoleList.Select(t => new UserTypeSelectDto() TrialUserRoleList = t.TrialUserRoleList.Select(t => new UserTypeSelectDto() { IsDeleted = t.IsDeleted, UserTypeId = t.UserRole.UserTypeRole.Id, UserTypeShortName = t.UserRole.UserTypeRole.UserTypeShortName }).ToList(),
{
IsDeleted = t.IsDeleted,
UserTypeId = t.UserRole.UserTypeRole.Id,
UserTypeShortName = t.UserRole.UserTypeRole.UserTypeShortName,
CreateTime=t.CreateTime,
UpdateTime=t.UpdateTime,
}).ToList(),
}).ToPagedListAsync(inQuery); }).ToPagedListAsync(inQuery);
var info = await _identityUserRepository.Where(t => t.Id == inQuery.IdentityUserId).Select(t => var info = await _identityUserRepository.Where(t => t.Id == inQuery.IdentityUserId).Select(t =>
new { t.CreateTime, t.UserCeateSource, t.Trial.ResearchProgramNo, t.Trial.ExperimentName, t.Trial.TrialCode }).FirstOrDefaultAsync(); new { t.CreateTime, t.UserCeateSource, t.Trial.ResearchProgramNo,t.Trial.ExperimentName, t.Trial.TrialCode }).FirstOrDefaultAsync();
return ResponseOutput.Ok(list, info); return ResponseOutput.Ok(list, info);
} }