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

Test_HIR_Net8
hang 2025-08-29 15:59:45 +08:00
parent 9de6a3c813
commit d769d43d23
4 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -17471,6 +17471,18 @@
<param name="_identityUserRepository"></param>
<param name="_userRoleRepository"></param>
</member>
<member name="T:IRaCIS.Core.Application.Triggers.AfterSaveTrigger.UserLogAfterTrigger">
<summary>
账户日志 记录账户每次操作的信息
</summary>
<param name="_identityUserRepository"></param>
</member>
<member name="M:IRaCIS.Core.Application.Triggers.AfterSaveTrigger.UserLogAfterTrigger.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser})">
<summary>
账户日志 记录账户每次操作的信息
</summary>
<param name="_identityUserRepository"></param>
</member>
<member name="T:IRaCIS.Core.Application.Triggers.TrialCriterionSignTrigger">
<summary>
因为可能先一致性核查通过，生成其他标准的任务了，新签名的标准也需要产生任务

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

@ -1,4 +1,5 @@
using IP2Region.Net.Abstractions;
using DocumentFormat.OpenXml.Bibliography;
using IP2Region.Net.Abstractions;
using IRaCIS.Application.Contracts;
using IRaCIS.Core.Application.Auth;
using IRaCIS.Core.Application.Contracts;
@ -27,6 +28,7 @@ namespace IRaCIS.Core.Application.Service
[ApiExplorerSettings(GroupName = "HIR")]
public class UserService(IRepository<UserRole> _userRoleRepository,
IMailVerificationService _mailVerificationService,
IRepository<TrialIdentityUser> _trialIdentityUserRepository,
IRepository<VerificationCode> _verificationCodeRepository,
IRepository<HIRHospital> _hirHospitalRepository,
IRepository<TrialUserRole> _userTrialRepository,
@ -577,6 +579,24 @@ namespace IRaCIS.Core.Application.Service
await _identityUserRepository.AddAsync(saveItem);
var success = await _identityUserRepository.SaveChangesAsync();
if (userAddModel.UserName.IsNotNullOrEmpty())
{
//自动添加到项目用户里面
var trialId = (Guid)userAddModel.TrialId;
var currentUser = new TrialIdentityUser()
{
TrialId = trialId,
IdentityUserId = saveItem.Id,
JoinTime = DateTime.Now,
TrialUserRoleList = saveItem.UserRoleList.Select(t => new TrialUserRole() { UserId = t.Id, TrialId = trialId }).ToList()
};
await _trialIdentityUserRepository.AddAsync(currentUser);
}
}
if (hospitalInfo.IsCanConnectInternet)

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

@ -126,7 +126,7 @@ namespace IRaCIS.Core.Application.Service
//.Where(t => userTypeEnums.Contains(t.UserTypeEnum))
.Where(t => t.IdentityUser.Status == UserStateEnum.Enable && t.IsUserRoleDisabled == false)
.Where(t => t.IdentityUser.IdentityUserHospitalGroupList.Any(t => t.HospitalGroupId == hospitalGroupId))
.Where(t => t.IdentityUser.IdentityUserHospitalGroupList.Any(t => t.HospitalGroupId == hospitalGroupId && t.IsDisabled == false))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => (t.IdentityUser.FullName).Contains(inQuery.UserRealName))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserName), t => t.IdentityUser.UserName.Contains(inQuery.UserName))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.OrganizationName), t => t.IdentityUser.OrganizationName.Contains(inQuery.OrganizationName))

3
IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs
View File

@ -26,7 +26,8 @@ public class HospitalGroupService(IRepository<HospitalGroup> _hospitalGroupRepos
public async Task<List<HospitalGroupAdminUserInfo>> GetGAUserList(Guid hospitalGroupId)
{
var list = await _identityUserRepository.Where(t => t.UserRoleList.Any(t => t.UserTypeEnum == UserTypeEnum.GA && t.IsUserRoleDisabled == false) && t.IdentityUserHospitalGroupList.Any(t => t.HospitalGroupId == hospitalGroupId))
var list = await _identityUserRepository.Where(t => t.UserRoleList.Any(t => t.UserTypeEnum == UserTypeEnum.GA && t.IsUserRoleDisabled == false)
&& t.IdentityUserHospitalGroupList.Any(t => t.HospitalGroupId == hospitalGroupId && t.IsDisabled == false))
.ProjectTo<HospitalGroupAdminUserInfo>(_mapper.ConfigurationProvider).ToListAsync();
return list;