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

IRaCIS.Core.Application/Service/Common/MailService.cs

@@ -7,6 +7,7 @@ using IRaCIS.Core.Infrastructure;
 using MailKit;
 using Medallion.Threading;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
 using MimeKit;
 
@@ -485,14 +486,6 @@ namespace IRaCIS.Core.Application.Service
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, null);
 
-            //创建账号 和创建角色 一条，更新的时候才记录更新角色
-            if (!sysUserInfo.IsFirstAdd)
-            {
-                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = userId, OptType = UserOptType.UpdateUserRole }, true);
-
-            }
-
-
         }
 
         //Site调研 用户加入项目
@@ -553,13 +546,6 @@ namespace IRaCIS.Core.Application.Service
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
 
-            //创建账号 和创建角色 一条，更新的时候才记录更新角色
-            if (!sysUserInfo.IsFirstAdd)
-            {
-                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = userId, OptType = UserOptType.UpdateUserRole }, true);
-
-            }
-
         }
 
 
@@ -574,6 +560,9 @@ namespace IRaCIS.Core.Application.Service
 
             var userType = await _userTypeRepository.FirstAsync(t => t.UserTypeEnum == UserTypeEnum.IndependentReviewer);
 
+            //需要创建新的账户
+            var isNeedCreateNewUser = false;
+
             var @lock = _distributedLockProvider.CreateLock($"UserCode");
 
             using (await @lock.AcquireAsync())
@@ -583,6 +572,7 @@ namespace IRaCIS.Core.Application.Service
 
                 if (!isDoctorHaveAccount)
                 {
+                    isNeedCreateNewUser = true;
 
                     var saveItem = new IdentityUser() { FirstName = doctor.FirstName, LastName = doctor.LastName, EMail = doctor.EMail };
 
@@ -685,10 +675,9 @@ namespace IRaCIS.Core.Application.Service
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, null);
 
             //创建账号 和创建角色 一条，更新的时候才记录更新角色
-            if (!sysUserInfo.IsFirstAdd)
+            if (isNeedCreateNewUser == false)
             {
                 await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = sysUserInfo.Id, OptType = UserOptType.UpdateUserRole }, true);
-
             }
 
 

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

@@ -87,6 +87,8 @@ namespace IRaCIS.Core.Application.Service
                     addOrEditUserFeedBack.TrialSiteId = info.TrialSiteId;
                     addOrEditUserFeedBack.SubjectVisitId = info.SourceSubjectVisitId;
                 }
+
+                addOrEditUserFeedBack.State = 0;//设置解决后IR 更新反馈自动变为未解决
             }
 
             else if (addOrEditUserFeedBack.SubjectVisitId != null)

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

@@ -54,6 +54,7 @@ namespace IRaCIS.Core.Application.Contracts
         ITokenService _tokenService,
         IRepository<UserType> _userTypeRepository,
         IMailVerificationService _mailVerificationService,
+         IRepository<UserLog> _userLogRepository,
         IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialSiteSurveyService
     {
         private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
@@ -672,7 +673,7 @@ namespace IRaCIS.Core.Application.Contracts
                 TrialSiteSurveyId = currentEntity!.Id,
                 Token = _tokenService.GetToken(new UserTokenInfo()
                 {
-                    IdentityUserId=Guid.NewGuid(),
+                    IdentityUserId = Guid.NewGuid(),
                     UserRoleId = Guid.NewGuid(),
                     UserName = "SiteSurvey",
                     UserTypeEnum = UserTypeEnum.Undefined,
@@ -871,6 +872,8 @@ namespace IRaCIS.Core.Application.Contracts
 
                 #region 人员生成
 
+                //需要创建新的账户
+                var isNeedCreateNewUser = existSysUser == null;
 
                 if (existSysUser != null)
                 {
@@ -949,11 +952,12 @@ namespace IRaCIS.Core.Application.Contracts
 
                 }
 
+
+
                 #endregion
 
                 await _identityUserRepository.SaveChangesAsync();
 
-
                 var identityUserId = existSysUser.Id;
 
                 #region 项目加入
@@ -1048,12 +1052,18 @@ namespace IRaCIS.Core.Application.Contracts
 
                 if (isNeedSendEmail)
                 {
+                    //创建账号 和创建角色 一条，更新的时候才记录更新角色
+                    if (isNeedCreateNewUser == false)
+                    {
+                        await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = identityUserId, OptType = UserOptType.UpdateUserRole });
+                    }
 
                     var dbUserType = _userTypeRepository.Where(t => userTypeIdList.Contains(t.Id)).ToList();
 
                     var usertyps = string.Join(',', dbUserType.Select(t => t.UserTypeName));
 
                     await _mailVerificationService.SiteSurveyUserJoinEmail(trialId, identityUserId, usertyps, baseUrl, routeUrl);
+
                 }
 
                 var userJoinIdList = item.Select(t => t.Id).ToList();
@@ -1104,6 +1114,9 @@ namespace IRaCIS.Core.Application.Contracts
 
                 var existSysUser = await _identityUserRepository.Where(t => t.EMail == userEmail, true).Include(t => t.UserRoleList).FirstOrDefaultAsync();
 
+                //需要创建新的账户
+                var isNeedCreateNewUser = existSysUser == null;
+
                 if (existSysUser != null)
                 {
 
@@ -1288,9 +1301,17 @@ namespace IRaCIS.Core.Application.Contracts
 
                 if (isNeedSendEmail)
                 {
+                    //创建账号 和创建角色 一条，更新的时候才记录更新角色
+                    if (isNeedCreateNewUser == false)
+                    {
+                        await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = identityUserId, OptType = UserOptType.UpdateUserRole });
+                    }
+
                     var dbUserType = _userTypeRepository.Where(t => userTypeIdList.Contains(t.Id)).ToList();
                     var usertyps = string.Join(',', dbUserType.Select(t => t.UserTypeName));
                     await _mailVerificationService.SiteSurveyUserJoinEmail(trialId, identityUserId, usertyps, baseUrl, routeUrl);
+
+
                 }
                 await _trialSiteUserRoleRepository.SaveChangesAsync();
 

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

@@ -31,6 +31,7 @@ namespace IRaCIS.Core.Application.Service
          IRepository<TrialIdentityUser> _trialIdentityUserRepository,
         IRepository<Trial> _trialRepository,
         IRepository<UserType> _userTypeRepository,
+         IRepository<UserLog> _userLogRepository,
         IMailVerificationService _mailVerificationService,
         IDistributedLockProvider _distributedLockProvider, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialExternalUserService
     {
@@ -215,8 +216,13 @@ namespace IRaCIS.Core.Application.Service
 
                 //var identityUserId = item.Key;
 
+
+
                 var existSysUser = await _identityUserRepository.Where(t => t.EMail == userEmail, true).Include(t => t.UserRoleList).FirstOrDefaultAsync();
 
+                //需要创建新的账户
+                var isNeedCreateNewUser = existSysUser == null;
+
                 if (existSysUser != null)
                 {
 
@@ -294,7 +300,7 @@ namespace IRaCIS.Core.Application.Service
 
                     var newAddUser = await _identityUserRepository.AddAsync(generateUser);
 
-                   
+
 
                     existSysUser = newAddUser;
 
@@ -390,6 +396,12 @@ namespace IRaCIS.Core.Application.Service
 
                 await _trialExternalUseRepository.BatchUpdateNoTrackingAsync(t => externalIdList.Contains(t.Id), u => new TrialExternalUser() { IsJoin = true });
 
+                //创建账号 和创建角色 一条，更新的时候才记录更新角色
+                if (isNeedCreateNewUser == false)
+                {
+                    await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = identityUserId, OptType = UserOptType.UpdateUserRole }, true);
+                }
+
 
             }