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

IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs

@@ -184,7 +184,7 @@ namespace IRaCIS.Core.Application.Service
 
                 var first = currentUserRoleList.FirstOrDefault();
 
-                var findTrialuser = await _trialIdentityUserRepository.Where(t => t.TrialId == first.TrialId && t.IdentityUserId == item.Key, true).Include(t => t.TrialUserRoleList).FirstOrDefaultAsync();
+                var findTrialuser = await _trialIdentityUserRepository.Where(t => t.TrialId == first.TrialId && t.IdentityUserId == item.Key, true, true).Include(t => t.TrialUserRoleList).FirstOrDefaultAsync();
 
                 if (findTrialuser == null)
                 {
@@ -201,6 +201,13 @@ namespace IRaCIS.Core.Application.Service
                 }
                 else
                 {
+                    if (findTrialuser.IsDeleted = true)
+                    {
+                        findTrialuser.IsDeleted = false;
+                        findTrialuser.JoinTime = DateTime.Now;
+                        findTrialuser.RemoveTime = null;
+                    }
+
                     findTrialuser.TrialUserRoleList.AddRange(currentUserRoleList.Select(t => new TrialUserRole() { UserId = t.UserId, TrialId = t.TrialId, TrialUserId = findTrialuser.Id }).ToList());
                 }