Compare commits

..

No commits in common. "9545e699c2947fe2912b2f7bf7cff41a78043109" and "0a8573091e085453881df49f0bca0c7ee60b23e4" have entirely different histories.

3 changed files with 1 additions and 9 deletions

View File

@ -317,8 +317,6 @@ 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

View File

@ -516,8 +516,6 @@ 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);

View File

@ -69,10 +69,6 @@ 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>();