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

修改用户列表选择

Test_IRC_Net8
hang 2025-09-29 10:30:09 +08:00
parent 406235cc03
commit 87955d2ca0
3 changed files with 9 additions and 1 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

@ -317,6 +317,8 @@ namespace IRaCIS.Application.Contracts
public UserCeateSource? UserCeateSource { get; set; } public UserCeateSource? UserCeateSource { get; set; }
public Guid? AuditRecordId { get; set; } public Guid? AuditRecordId { get; set; }
public bool? IsAuditRecordUserSelect { get; set; }
} }
public class UserRoleInfoDTO public class UserRoleInfoDTO

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

@ -516,6 +516,8 @@ namespace IRaCIS.Core.Application.Service
.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) .WhereIf(inQuery.UserCeateSource != null, t => t.UserCeateSource == inQuery.UserCeateSource)
.WhereIf(inQuery.AuditRecordId != null && inQuery.IsAuditRecordUserSelect == true, t => t.AuditRecordList.Any(t => t.AuditRecordId == inQuery.AuditRecordId))
.WhereIf(inQuery.AuditRecordId != null && inQuery.IsAuditRecordUserSelect == false, t => !t.AuditRecordList.Any(t => t.AuditRecordId == inQuery.AuditRecordId))
.ProjectTo<UserListDTO>(_mapper.ConfigurationProvider); .ProjectTo<UserListDTO>(_mapper.ConfigurationProvider);
var pageList = await userQueryable.ToPagedListAsync(inQuery); var pageList = await userQueryable.ToPagedListAsync(inQuery);

4
IRaCIS.Core.Domain/Management/User.cs
View File

@ -69,6 +69,10 @@ public class IdentityUser : BaseFullAuditEntity
[JsonIgnore] [JsonIgnore]
public List<TrialIdentityUser> UserTrialList { get; set; } public List<TrialIdentityUser> UserTrialList { get; set; }
[JsonIgnore]
public List<AuditRecordIdentityUser> AuditRecordList { get; set; }
[JsonIgnore] [JsonIgnore]
public List<UserRole> UserRoleList { get; set; } = new List<UserRole>(); public List<UserRole> UserRoleList { get; set; } = new List<UserRole>();