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

Merge branch 'Test_HIR_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_HIR_Net8
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
hang 2025-09-01 13:13:07 +08:00
parent 20014e66d0 8be56c5a4d
commit b331799b3f
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
View File

@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Service
IRepository<Dictionary> _dictionaryRepository, IRepository<Dictionary> _dictionaryRepository,
IRepository<Trial> _trialRepository, IRepository<Trial> _trialRepository,
IRepository<UserRole> _userRoleRepository, IRepository<UserRole> _userRoleRepository,
IRepository<IdentityUser> _identityUserRepository,
IRepository<CheckChallengeDialog> _checkChallengeDialogRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IFrontAuditConfigService IRepository<CheckChallengeDialog> _checkChallengeDialogRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IFrontAuditConfigService
{ {
@ -364,12 +364,18 @@ namespace IRaCIS.Core.Application.Service
var userObj = await _userRoleRepository.Where(t => t.Id == objectRelationParentId).Select(t => new { UserRealName = t.IdentityUser.FullName, t.IdentityUser.Phone, t.IdentityUser.UserName, UserType = t.UserTypeRole.UserTypeShortName, t.UserTypeEnum, t.IdentityUser.EMail, t.IdentityUser.OrganizationName }).FirstOrDefaultAsync(); var userObj = await _userRoleRepository.Where(t => t.Id == objectRelationParentId).Select(t => new { UserRealName = t.IdentityUser.FullName, t.IdentityUser.Phone, t.IdentityUser.UserName, UserType = t.UserTypeRole.UserTypeShortName, t.UserTypeEnum, t.IdentityUser.EMail, t.IdentityUser.OrganizationName }).FirstOrDefaultAsync();
var identityUserObj = await _identityUserRepository.Where(t => t.Id == objectRelationParentId).Select(t => new { UserRealName = t.FullName, t.Phone, t.UserName, }).FirstOrDefaultAsync();
// 为什么要查用户 因为表dataInspection 中有用户的稽查 但是用户名为空 // 为什么要查用户 因为表dataInspection 中有用户的稽查 但是用户名为空
if (userObj != null) if (userObj != null)
{ {
objectLsit.Add(userObj); objectLsit.Add(userObj);
} }
else if (identityUserObj != null)
{
objectLsit.Add(identityUserObj);
}
else if (relationParentInspection != null) else if (relationParentInspection != null)
{ {

13
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -1587,7 +1587,20 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}); });
} }
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialIdentityUser)))
{
var type = GetEntityAuditOpt(item);
var entity = item.Entity as TrialIdentityUser;
//var user = await _dbContext.Users.Include(x => x.UserTypeRole).FirstOrDefaultAsync(x => x.Id == entity.UserId);
await InsertInspection<TrialIdentityUser>(entity, type, x => new InspectionConvertDTO
{
IsDistinctionInterface = type == AuditOpt.Update ? true : false,
TrialId = x.TrialId,
ObjectRelationParentId = x.TrialId,
ObjectRelationParentId2 = x.IdentityUserId,
});
}
// 项目人员 // 项目人员
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialUserRole))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialUserRole)))