Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs

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

IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -516,6 +516,8 @@ namespace IRaCIS.Core.Application.Service
                  .WhereIf(inQuery.IsTestUser != null, t => t.IsTestUser == inQuery.IsTestUser)
                  .WhereIf(inQuery.IsZhiZhun != null, t => t.IsZhiZhun == inQuery.IsZhiZhun)
                  .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);
 
             var pageList = await userQueryable.ToPagedListAsync(inQuery);

IRaCIS.Core.Domain/Management/User.cs

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