中心调研人员退出bug

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -17537,17 +17537,17 @@
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question">
             <summary>
-            ����
+            质疑
             </summary>
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency">
             <summary>
-            һ���Ժ˲�
+            一致性核查
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto">
             <summary>
-            ����
+            复制
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView">

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -1137,23 +1137,26 @@ namespace IRaCIS.Core.Application.Contracts
 
                 await _trialSiteUserSurveyRepository.UpdatePartialFromQueryAsync(t => userJoinIdList.Contains(t.Id), u => new TrialSiteUserSurvey() { IsJoin = true, SystemUserId = existSysUser.Id });
 
-                //中心调研设置用户角色退出
-                var needQuitUserList = item.Where(t => t.IsHistoryUser && t.IsHistoryUserOriginDeleted == false && t.IsHistoryUserDeleted == true).ToList();
-
-                var queitUserTypeIdList = needQuitUserList.Select(t => t.UserTypeId).ToList();
-
-
-                await _trialSiteUserRoleRepository.UpdatePartialFromQueryAsync(t => t.TrialId == trialId && t.TrialSiteId == trialSiteId && queitUserTypeIdList.Contains(t.UserRole.UserTypeId), c => new TrialSiteUserRole()
-                {
-                    IsDeleted = true,
-                    DeletedTime = DateTime.Now,
-                });
-
+              
 
                 await _trialSiteUserRoleRepository.SaveChangesAsync();
 
             }
 
+
+            //中心调研设置用户角色退出
+            var needQuitUserList = allUserList.Where(t => t.IsHistoryUser && t.IsHistoryUserOriginDeleted == false && t.IsHistoryUserDeleted == true).ToList();
+
+            var queitUserTypeIdList = needQuitUserList.Select(t => t.UserTypeId).ToList();
+
+
+            await _trialSiteUserRoleRepository.UpdatePartialFromQueryAsync(t => t.TrialId == trialId && t.TrialSiteId == trialSiteId && queitUserTypeIdList.Contains(t.UserRole.UserTypeId), c => new TrialSiteUserRole()
+            {
+                IsDeleted = true,
+                DeletedTime = DateTime.Now,
+            });
+
+
             await _trialSiteSurveyRepository.UpdatePartialFromQueryAsync(t => t.Id == trialSiteSurveyId && t.State == TrialSiteSurveyEnum.SPMApproved, u => new TrialSiteSurvey() { State = TrialSiteSurveyEnum.PMCreatedAndLock, ReviewerUserId = _userInfo.UserRoleId, ReviewerTime = DateTime.Now });
 
         }