XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改列表
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
hang 2025-02-25 10:26:55 +08:00
parent 812035686e
commit 73912fd875
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs
View File

@ -311,6 +311,8 @@ namespace IRaCIS.Application.Contracts
public DateTime? BeginLastChangePassWordTime { get; set; } public DateTime? BeginLastChangePassWordTime { get; set; }
public DateTime? EndLastChangePassWordTime { get; set; } public DateTime? EndLastChangePassWordTime { get; set; }
public UserCeateSource? UserCeateSource { get; set; }
} }
public class UserRoleInfoDTO public class UserRoleInfoDTO

1
IRaCIS.Core.Application/Service/Management/UserService.cs
View File

@ -514,6 +514,7 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(inQuery.UserState != null, t => t.Status == inQuery.UserState) .WhereIf(inQuery.UserState != null, t => t.Status == inQuery.UserState)
.WhereIf(inQuery.IsTestUser != null, t => t.IsTestUser == inQuery.IsTestUser) .WhereIf(inQuery.IsTestUser != null, t => t.IsTestUser == inQuery.IsTestUser)
.WhereIf(inQuery.IsZhiZhun != null, t => t.IsZhiZhun == inQuery.IsZhiZhun) .WhereIf(inQuery.IsZhiZhun != null, t => t.IsZhiZhun == inQuery.IsZhiZhun)
.WhereIf(inQuery.UserCeateSource != null, t => t.UserCeateSource == inQuery.UserCeateSource)
.ProjectTo<UserListDTO>(_mapper.ConfigurationProvider); .ProjectTo<UserListDTO>(_mapper.ConfigurationProvider);
return await userQueryable.ToPagedListAsync(inQuery); return await userQueryable.ToPagedListAsync(inQuery);

7
IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
View File

@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Service
} }
[HttpPost] [HttpPost]
public async Task<PageOutput<IdentityUserJoinedTrialView>> GetUserJoinedTrialList(IdentityUserJoinedTrialQuery inQuery) public async Task<IResponseOutput<PageOutput<IdentityUserJoinedTrialView>>> GetUserJoinedTrialList(IdentityUserJoinedTrialQuery inQuery)
{ {
var list = await _trialIdentityUserRepository.Where(t => t.IdentityUserId == inQuery.IdentityUserId, false, true) var list = await _trialIdentityUserRepository.Where(t => t.IdentityUserId == inQuery.IdentityUserId, false, true)
.WhereIf(!string.IsNullOrEmpty(inQuery.TrialCode), o => o.Trial.TrialCode.Contains(inQuery.TrialCode)) .WhereIf(!string.IsNullOrEmpty(inQuery.TrialCode), o => o.Trial.TrialCode.Contains(inQuery.TrialCode))
@ -54,7 +54,10 @@ namespace IRaCIS.Core.Application.Service
}).ToPagedListAsync(inQuery); }).ToPagedListAsync(inQuery);
return list; var info = await _trialIdentityUserRepository.Where(t => t.IdentityUserId == inQuery.IdentityUserId).Select(t =>
new { t.IdentityUser.CreateTime, t.IdentityUser.UserCeateSource, t.Trial.ResearchProgramNo, t.Trial.TrialCode }).FirstOrDefaultAsync();
return ResponseOutput.Ok(list, info);
} }
#region 多账户调整已修改 #region 多账户调整已修改