账户稽查修改

IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs

@@ -1269,17 +1269,23 @@ namespace IRaCIS.Core.Application.Service
 
             var emailNoticeConfigQueryable = _emailNoticeConfigRepository
 
-              .WhereIf(trialConfig.IsEnrollementQualificationConfirm == true, t => t.BusinessModuleEnum == BusinessModule.EligibilityVerification)
-              .WhereIf(trialConfig.IsPDProgressView == true, t => t.BusinessModuleEnum == BusinessModule.PDVerification)
+              .WhereIf(trialConfig.IsEnrollementQualificationConfirm == true && trialConfig.IsPDProgressView == false, t => t.BusinessModuleEnum == BusinessModule.EligibilityVerification || t.BusinessModuleEnum == BusinessModule.Eligibility_PDVerification)
+              .WhereIf(trialConfig.IsEnrollementQualificationConfirm == false && trialConfig.IsPDProgressView == true, t => t.BusinessModuleEnum == BusinessModule.PDVerification || t.BusinessModuleEnum == BusinessModule.Eligibility_PDVerification)
                .WhereIf(trialConfig.IsPDProgressView == true && trialConfig.IsEnrollementQualificationConfirm == true, t => t.BusinessModuleEnum == BusinessModule.PDVerification
-               && t.BusinessModuleEnum == BusinessModule.EligibilityVerification)
+               || t.BusinessModuleEnum == BusinessModule.EligibilityVerification || t.BusinessModuleEnum == BusinessModule.Eligibility_PDVerification)
               .ProjectTo<TrialSelectEmailNoticeConfigView>(_mapper.ConfigurationProvider);
 
 
             var list = await emailNoticeConfigQueryable.ToListAsync();
 
+            var addList = _mapper.Map<List<BatchAddTrialEmailNoticeConfig>>(list.Where(t => t.IsHaveSelected == false).ToList());
 
-            return await BatchAddSysEmailConfig(_mapper.Map<List<BatchAddTrialEmailNoticeConfig>>(list.Where(t => t.IsHaveSelected == false).ToList()));
+            foreach (var item in addList)
+            {
+                item.TrialId = trialId;
+            }
+
+            return await BatchAddSysEmailConfig(addList);
 
         }
         /// <summary>
@@ -1289,6 +1295,10 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         public async Task<IResponseOutput> BatchAddSysEmailConfig(List<BatchAddTrialEmailNoticeConfig> batchAddList)
         {
+            if (!batchAddList.Any())
+            {
+                return ResponseOutput.Ok();
+            }
 
             var first = batchAddList.First();
             var trialId = first.TrialId;
@@ -1351,7 +1361,7 @@ namespace IRaCIS.Core.Application.Service
         {
             //await SyncSystemEmainCofigDocListAsync(inQuery.TrialId);
 
-
+            var trialConfig = _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new { t.IsEnrollementQualificationConfirm, t.IsPDProgressView }).First();
 
             var trialEmailNoticeConfigQueryable = _trialEmailNoticeConfigRepository.Where(t => t.TrialId == inQuery.TrialId)
               .WhereIf(inQuery.IsDistinguishCriteria == false, t => t.TrialReadingCriterionId == null)

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

@@ -135,7 +135,7 @@ namespace IRaCIS.Application.Contracts
         public string LastName { get; set; } = string.Empty;
         public int? Sex { get; set; } // 1-男  2-女
 
-        public int Status { get; set; } = 1; // 0-已删除 1-正常
+        public UserStateEnum Status { get; set; } = UserStateEnum.Enable;
 
         public string Phone { get; set; } = string.Empty;
         public string EMail { get; set; } = string.Empty;

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

@@ -558,6 +558,13 @@ namespace IRaCIS.Core.Application.Service
 
             if (user == null) return Null404NotFound(user);
 
+            if (user.Status!=model.Status)
+            {
+                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.Id, OptUserId = model.Id, OptType = model.Status == UserStateEnum.Enable ? UserOptType.AccountEnable : UserOptType.AccountLocked }, true);
+
+            }
+
+
             _mapper.Map(model, user);
 
             if (user.IsZhiZhun)
@@ -565,7 +572,9 @@ namespace IRaCIS.Core.Application.Service
                 user.OrganizationName = _userInfo.IsEn_Us ? _systemEmailConfig.OrganizationName : _systemEmailConfig.OrganizationNameCN;
             }
 
-            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.Id, OptUserId = model.Id, OptType = UserOptType.UpdateUser }, true);
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.Id, OptUserId = model.Id, OptType = UserOptType.UpdateUser });
+
+           
 
             var success = await _userRepository.SaveChangesAsync();
 
@@ -802,7 +811,7 @@ namespace IRaCIS.Core.Application.Service
             DateTime? trialCreateTime = inQuery.TrialId != null ? _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => t.CreateTime).FirstOrDefault() : null;
 
             var userLogQueryable =
-               _userLogRepository
+               _userLogRepository.AsQueryable().IgnoreQueryFilters()
                .WhereIf(inQuery.TrialId != null, t => t.LoginUser.UserTrials.Any(c => c.TrialId == inQuery.TrialId && (c.UserId == t.LoginUserId || c.UserId == t.OptUserId)))
                .WhereIf(trialCreateTime != null, t => t.CreateTime >= trialCreateTime)
                .WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType)