匿名修改账户信息

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

@@ -1027,7 +1027,7 @@
         </member>
         <member name="M:IRaCIS.Core.Application.Services.TrialMaintenanceService.TrialSiteUserListExport(System.Guid,System.Boolean,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUserSurvey})">
             <summary>
-            
+            Site用户列表导出
             </summary>
             <param name="trialId"></param>
             <param name="isAllSiteUser">isAllSiteUser true ： site用户列表，false ：Site调研汇总表</param>
@@ -2033,20 +2033,33 @@
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Application.Services.UserService.SendVerificationCode(System.String)">
-            <summary>发送验证码 邮箱或者手机号 New </summary>
+            <summary>发送验证码  修改邮箱（已经登陆修改） New </summary>
         </member>
-        <member name="M:IRaCIS.Application.Services.UserService.SendVerificationCode(System.String,IRaCIS.Core.Domain.Share.VerifyType,System.Boolean)">
+        <member name="M:IRaCIS.Application.Services.UserService.ResetPassword(System.Guid)">
             <summary>
-            发送验证码 邮箱或者手机号
+            重置密码为 默认密码
             </summary>
-            <param name="emailOrPhone"></param>
+            <param name="userId"></param>
-            <param name="verificationType"></param>
-            <param name="isReviewer"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Application.Services.UserService.SetNewPassword(IRaCIS.Application.Contracts.ResetPasswordCommand)">
+        <member name="M:IRaCIS.Application.Services.UserService.ModifyPassword(IRaCIS.Application.Contracts.EditPasswordCommand)">
             <summary>
-            验证设置新密码
+            修改密码,当前支持旧密码修改密码
+            </summary>
+            <param name="editPwModel"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Application.Services.UserService.SendVerificationCode(System.String,System.String)">
+            <summary>
+             重置密码发邮件  （未登陆修改）
+            </summary>
+            <param name="email"></param>
+            <param name="userName"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Application.Services.UserService.SetNewPassword(IRaCIS.Application.Contracts.AllowAnonymousResetPasswordCommand)">
+             <summary>
+            接受验证码 设置新密码  （未登陆修改）  
              </summary>
              <param name="resetPwdModel"></param>
              <returns></returns>
@@ -2094,20 +2107,6 @@
             <param name="state"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Application.Services.UserService.ResetPassword(System.Guid)">
-            <summary>
-            重置密码为 默认密码
-            </summary>
-            <param name="userId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Application.Services.UserService.ModifyPassword(IRaCIS.Application.Contracts.EditPasswordCommand)">
-            <summary>
-            修改密码,当前支持旧密码修改密码，手机及邮箱验证码后续支持[New]
-            </summary>
-            <param name="editPwModel"></param>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Application.Services.UserService.Login(System.String,System.String)">
             <summary>
             用户登陆
@@ -2116,6 +2115,22 @@
             <param name="password"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.UserService.SendVerificationCode(System.String,IRaCIS.Core.Domain.Share.VerifyType,System.Boolean)">
+            <summary>
+            发送验证码 邮箱或者手机号
+            </summary>
+            <param name="emailOrPhone"></param>
+            <param name="verificationType"></param>
+            <param name="isReviewer"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Application.Services.UserService.SetNewPassword(IRaCIS.Application.Contracts.ResetPasswordCommand)">
+            <summary>
+            验证设置新密码
+            </summary>
+            <param name="resetPwdModel"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Application.Services.StatisticsService">
             <summary>
             Dashboard统计、全局工作量统计、入组两个维度统计（按照项目、按照人）

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

@@ -39,7 +39,7 @@ namespace IRaCIS.Application.Services
             //收件地址
             messageToSend.To.Add(new MailboxAddress(userName, emailAddress));
             //主题
-            messageToSend.Subject = "Reset PassWord (Verification Code)";
+            messageToSend.Subject = "Reset email (Verification Code)";
 
             messageToSend.Body = new TextPart("plain")
             {

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

@@ -208,6 +208,19 @@ namespace IRaCIS.Application.Contracts
         public Guid UserId { get; set; }
         public IEnumerable<RoleDTO> RoleList { get; set; }=new List<RoleDTO>();
     }
+
+
+    public class AllowAnonymousResetPasswordCommand
+    {
+        public string  Email { get; set; } = string.Empty;
+
+        public string VerificationCode { get; set; } = string.Empty;
+
+        public string NewPwd { get; set; } = string.Empty;
+
+        public string UserName { get; set; } = string.Empty;
+    }
+
     public class ResetPasswordCommand
     {
         public string EmailOrPhone { get; set; } = string.Empty;

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

@@ -10,6 +10,7 @@ using IRaCIS.Core.API.Utility.AOP;
 
 using Microsoft.AspNetCore.Mvc;
 using Panda.DynamicWebApi.Attributes;
+using Microsoft.AspNetCore.Authorization;
 
 namespace IRaCIS.Application.Services
 {
@@ -38,7 +39,7 @@ namespace IRaCIS.Application.Services
             _userTrialRepository = userTrialRepository;
         }
 
-        /// <summary>发送验证码 邮箱或者手机号 New </summary>
+        /// <summary>发送验证码  修改邮箱（已经登陆修改） New </summary>
 
         [HttpGet("{email}")]
         public async Task<IResponseOutput> SendVerificationCode(string email)
@@ -72,7 +73,6 @@ namespace IRaCIS.Application.Services
 
         }
 
-
         [HttpPut("{newEmail}/{verificationCode}")]
         public async Task<IResponseOutput> SetNewEmail(string newEmail, string verificationCode)
         {
@@ -154,160 +154,138 @@ namespace IRaCIS.Application.Services
         }
 
 
+        /// <summary>
+        /// 重置密码为 默认密码
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        [HttpGet("{userId:guid}")]
+
+        public async Task<IResponseOutput> ResetPassword(Guid userId)
+        {
+            var success = await _userRepository.UpdateFromQueryAsync(t => t.Id == userId, u => new User()
+            {
+                Password = MD5Helper.Md5(StaticData.DefaultPassword),
+                PasswordChanged = false
+            });
+
+            return ResponseOutput.Result(success);
+        }
+
+        /// <summary>
+        /// 修改密码,当前支持旧密码修改密码
+        /// </summary>
+        /// <param name="editPwModel"><
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> ModifyPassword(EditPasswordCommand editPwModel)
+        {
 
 
+            if (!string.IsNullOrEmpty(editPwModel.NewUserName))
+            {
+                if (await _userRepository.AnyAsync(t => t.UserName == editPwModel.NewUserName && t.Id != _userInfo.Id))
+                {
+                    return ResponseOutput.NotOk("UserId  already exists");
+                }
+
+                var success = await _userRepository.UpdateFromQueryAsync(t => t.Id == _userInfo.Id, u => new User()
+                {
+                    UserName = editPwModel.NewUserName,
+                });
+
+            }
+
+            //验证旧密码OK
+            if (await _userRepository.FirstOrDefaultAsync(t => t.Id == _userInfo.Id && t.Password == editPwModel.OldPassWord) != null)
+            {
+                var success = await _userRepository.UpdateFromQueryAsync(t => t.Id == _userInfo.Id, u => new User()
+                {
+                    Password = editPwModel.NewPassWord,
+                    IsFirstAdd = false
+                });
+
+                return ResponseOutput.Result(success);
+            }
+
+            //医生密码
+            if (await _doctorRepository.AnyAsync(t => t.Id == _userInfo.Id && t.Password == editPwModel.OldPassWord))
+            {
+                var success = await _doctorRepository.UpdateFromQueryAsync(t => t.Id == _userInfo.Id, u => new Doctor()
+                {
+
+                    Password = editPwModel.NewPassWord
+                });
+
+                return ResponseOutput.Result(success);
+            }
+
+            return ResponseOutput.NotOk("Old password is wrong.");
+
+        }
 
 
         /// <summary>
-        /// 发送验证码 邮箱或者手机号
+        ///  重置密码发邮件  （未登陆修改）
         /// </summary>
-        /// <param name="emailOrPhone"></param>
+        /// <param name="email"></param>
-        /// <param name="verificationType"></param>
+        /// <param name="userName"></param>
-        /// <param name="isReviewer"></param>
         /// <returns></returns>
-        [HttpGet("{emailOrPhone}/{verificationType:int}")]
+        [AllowAnonymous]
-        public async Task<IResponseOutput> SendVerificationCode(string emailOrPhone, VerifyType verificationType, bool isReviewer = false)
+        [HttpGet("{email}/{userName}")]
+        public async Task<IResponseOutput> SendVerificationCode(string email,string userName)
         {
-            if (string.IsNullOrEmpty(emailOrPhone))
-            {
-                return ResponseOutput.NotOk(verificationType == VerifyType.Email ? "Please input email" : "Please input phone");
-
-            }
-            //防止输入前后有空格
-            var emailOrPhoneStr = emailOrPhone.Trim();
 
             //检查手机或者邮箱是否有效
-            if (!Regex.IsMatch(emailOrPhoneStr, @"/^1[34578]\d{9}$/") && !Regex.IsMatch(emailOrPhoneStr, @"^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$"))
+            if (!Regex.IsMatch(email, @"^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$"))
             {
 
-                return ResponseOutput.NotOk(verificationType == VerifyType.Email
+                return ResponseOutput.NotOk("Please input a legal email");
-                    ? "Please input a legal email"
-                    : "Please input a legal phone");
 
             }
 
-            //医生登录
+            ////查找改邮箱或者手机的用户
-            if (isReviewer)
+            var exist = await _userRepository.AnyAsync(t => t.EMail == email&& t.UserName == userName);
-            {
-                var exist = await _doctorRepository.AnyAsync(t => t.EMail == emailOrPhoneStr || t.Phone == emailOrPhoneStr);
 
             if (!exist)
             {
-                    return ResponseOutput.NotOk(verificationType == VerifyType.Email
+                return ResponseOutput.NotOk("User Id or  Email  not  correct");
-                        ? "No user with this email exists."
-                        : "No user with this phone exists.");
 
             }
+            var user = await _userRepository.FirstOrDefaultAsync(t => t.EMail == email);
+
 
-                var user = await _doctorRepository.FirstOrDefaultAsync(t => t.EMail == emailOrPhoneStr || t.Phone == emailOrPhoneStr);
-                //邮箱
-                if (verificationType == VerifyType.Email)
-                {
             //验证码 6位
             int verificationCode = new Random().Next(100000, 1000000);
 
-                    await _mailVerificationService.SendMail(user.Id, user.ChineseName, emailOrPhoneStr,
+            await _mailVerificationService.SendMail(user.Id, _userInfo.RealName, email, verificationCode);
-                        verificationCode);
-                }
-                //手机短信
-                else
-                {
-
-                }
-
-            }
-            else//管理用户登录
-            {
-                //查找改邮箱或者手机的用户
-                var exist = await _userRepository.AnyAsync(t => t.EMail == emailOrPhoneStr || t.Phone == emailOrPhoneStr);
-
-                if (!exist)
-                {
-                    return ResponseOutput.NotOk(verificationType == VerifyType.Email
-                        ? "No user with this email exists."
-                        : "No user with this phone exists.");
-
-                }
-                var user = await _userRepository.FirstOrDefaultAsync(t => t.EMail == emailOrPhoneStr || t.Phone == emailOrPhoneStr);
-                //邮箱
-                if (verificationType == VerifyType.Email)
-                {
-                    //验证码 6位
-                    int verificationCode = new Random().Next(100000, 1000000);
-
-                    await _mailVerificationService.SendMail(user.Id, user.LastName + ' ' + user.FirstName, emailOrPhoneStr,
-                        verificationCode);
-                }
-                //手机短信
-                else
-                {
-
-                }
-            }
 
             return ResponseOutput.Ok();
+
         }
 
 
+
         /// <summary>
-        /// 验证设置新密码
+        ///接受验证码 设置新密码  （未登陆修改）  
         /// </summary>
         /// <param name="resetPwdModel"></param>
         /// <returns></returns>
         [HttpPost]
-
+        [AllowAnonymous]
-        public async Task<IResponseOutput> SetNewPassword(ResetPasswordCommand resetPwdModel)
+        public async Task<IResponseOutput> SetNewPassword(AllowAnonymousResetPasswordCommand resetPwdModel)
-        {
-            if (resetPwdModel.IsReviewer)
-            {
-                var emailOrPhoneStr = resetPwdModel.EmailOrPhone.Trim();
-                var verificationCodeStr = resetPwdModel.VerificationCode.Trim();
-                var user = await _doctorRepository.FirstOrDefaultAsync(t => t.EMail == emailOrPhoneStr || t.Phone == emailOrPhoneStr);
-
-                var verificationRecord = await _verificationCodeRepository
-                    .FirstOrDefaultAsync(t => t.UserId == user.Id && t.Code == verificationCodeStr && t.CodeType == resetPwdModel.VerificationType);
-
-                //检查数据库是否存在该验证码
-                if (verificationRecord == null)
         {
 
-                    return ResponseOutput.NotOk("Verification code error");
+            var user = await _userRepository.FirstOrDefaultAsync(t => t.EMail == resetPwdModel.Email && t.UserName == resetPwdModel.UserName);
 
+            if (user == null)
+            {
+                return ResponseOutput.NotOk("User Id or  Email  not  correct");
             }
-                else
-                {
-                    //检查验证码是否失效
-                    if (verificationRecord.ExpirationTime < DateTime.Now)
-                    {
-                        return ResponseOutput.NotOk("The verification code has expired");
-
-                    }
-                    else //验证码正确 并且 没有超时 
-                    {
-                        //更新密码
-                        var success = await _doctorRepository.UpdateFromQueryAsync(t => t.Id == user.Id, u => new Doctor()
-                        {
-                            Password = resetPwdModel.NewPwd
-                        });
-
-                        //删除验证码历史记录
-                        await _verificationCodeRepository.DeleteFromQueryAsync(t => t.UserId == user.Id && t.CodeType == resetPwdModel.VerificationType);
-
-                        return ResponseOutput.Result(success);
-
-                    }
-                }
-            }
-            else
-            {
-                var emailOrPhoneStr = resetPwdModel.EmailOrPhone.Trim();
-                var verificationCodeStr = resetPwdModel.VerificationCode.Trim();
-
-                var user = await _userRepository.FirstOrDefaultAsync(t => t.EMail == emailOrPhoneStr || t.Phone == emailOrPhoneStr);
 
 
             var verificationRecord = await _verificationCodeRepository
-                    .FirstOrDefaultAsync(t => t.UserId == user.Id && t.Code == verificationCodeStr && t.CodeType == resetPwdModel.VerificationType);
+                .FirstOrDefaultAsync(t => t.UserId == user.Id && t.Code == resetPwdModel.VerificationCode && t.CodeType == VerifyType.Email);
 
             //检查数据库是否存在该验证码
             if (verificationRecord == null)
@@ -337,13 +315,13 @@ namespace IRaCIS.Application.Services
                     });
 
                     //删除验证码历史记录
-                        await _verificationCodeRepository.DeleteFromQueryAsync(t => t.UserId == user.Id && t.CodeType == resetPwdModel.VerificationType);
+                    await _verificationCodeRepository.DeleteFromQueryAsync(t => t.UserId == user.Id && t.CodeType == VerifyType.Email);
 
                     return ResponseOutput.Result(success);
 
                 }
             }
-            }
+
 
         }
 
@@ -351,16 +329,6 @@ namespace IRaCIS.Application.Services
 
 
 
-
-
-
-
-
-
-
-
-
-
         /// <summary>
         /// 获取用户列表
         /// </summary>
@@ -495,75 +463,7 @@ namespace IRaCIS.Application.Services
             return ResponseOutput.Result(success);
         }
 
-        /// <summary>
-        /// 重置密码为 默认密码
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        [HttpGet("{userId:guid}")]
 
-        public async Task<IResponseOutput> ResetPassword(Guid userId)
-        {
-            var success = await _userRepository.UpdateFromQueryAsync(t => t.Id == userId, u => new User()
-            {
-                Password = MD5Helper.Md5(StaticData.DefaultPassword),
-                PasswordChanged = false
-            });
-
-            return ResponseOutput.Result(success);
-        }
-
-        /// <summary>
-        /// 修改密码,当前支持旧密码修改密码，手机及邮箱验证码后续支持[New]
-        /// </summary>
-        /// <param name="editPwModel"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<IResponseOutput> ModifyPassword(EditPasswordCommand editPwModel)
-        {
-
-
-            if( !string.IsNullOrEmpty(editPwModel.NewUserName))
-            {
-                if (await _userRepository.AnyAsync(t => t.UserName == editPwModel.NewUserName && t.Id != _userInfo.Id))
-                {
-                    return ResponseOutput.NotOk("UserId  already exists");
-                }
-
-                var success = await _userRepository.UpdateFromQueryAsync(t => t.Id == _userInfo.Id, u => new User()
-                {
-                    UserName = editPwModel.NewUserName,
-                });
-
-            }
-
-            //验证旧密码OK
-            if (await _userRepository.FirstOrDefaultAsync(t => t.Id == _userInfo.Id && t.Password == editPwModel.OldPassWord) != null)
-            {
-                var success = await _userRepository.UpdateFromQueryAsync(t => t.Id == _userInfo.Id, u => new User()
-                {
-                    Password = editPwModel.NewPassWord,
-                    IsFirstAdd = false
-                });
-
-                return ResponseOutput.Result(success);
-            }
-
-            //医生密码
-            if (await _doctorRepository.AnyAsync(t => t.Id == _userInfo.Id && t.Password == editPwModel.OldPassWord))
-            {
-                var success = await _doctorRepository.UpdateFromQueryAsync(t => t.Id == _userInfo.Id, u => new Doctor()
-                {
-                   
-                    Password = editPwModel.NewPassWord
-                });
-
-                return ResponseOutput.Result(success);
-            }
-
-            return ResponseOutput.NotOk("Old password is wrong.");
-
-        }
 
 
         /// <summary>
@@ -612,6 +512,196 @@ namespace IRaCIS.Application.Services
         }
 
 
+        /// <summary>
+        /// 发送验证码 邮箱或者手机号
+        /// </summary>
+        /// <param name="emailOrPhone"></param>
+        /// <param name="verificationType"></param>
+        /// <param name="isReviewer"></param>
+        /// <returns></returns>
+        [HttpGet("{emailOrPhone}/{verificationType:int}")]
+        [Obsolete]
+        public async Task<IResponseOutput> SendVerificationCode(string emailOrPhone, VerifyType verificationType, bool isReviewer = false)
+        {
+            if (string.IsNullOrEmpty(emailOrPhone))
+            {
+                return ResponseOutput.NotOk(verificationType == VerifyType.Email ? "Please input email" : "Please input phone");
+
+            }
+            //防止输入前后有空格
+            var emailOrPhoneStr = emailOrPhone.Trim();
+
+            //检查手机或者邮箱是否有效
+            if (!Regex.IsMatch(emailOrPhoneStr, @"/^1[34578]\d{9}$/") && !Regex.IsMatch(emailOrPhoneStr, @"^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$"))
+            {
+
+                return ResponseOutput.NotOk(verificationType == VerifyType.Email
+                    ? "Please input a legal email"
+                    : "Please input a legal phone");
+
+            }
+
+            //医生登录
+            if (isReviewer)
+            {
+                var exist = await _doctorRepository.AnyAsync(t => t.EMail == emailOrPhoneStr || t.Phone == emailOrPhoneStr);
+
+                if (!exist)
+                {
+                    return ResponseOutput.NotOk(verificationType == VerifyType.Email
+                        ? "No user with this email exists."
+                        : "No user with this phone exists.");
+
+                }
+
+                var user = await _doctorRepository.FirstOrDefaultAsync(t => t.EMail == emailOrPhoneStr || t.Phone == emailOrPhoneStr);
+                //邮箱
+                if (verificationType == VerifyType.Email)
+                {
+                    //验证码 6位
+                    int verificationCode = new Random().Next(100000, 1000000);
+
+                    await _mailVerificationService.SendMail(user.Id, user.ChineseName, emailOrPhoneStr,
+                        verificationCode);
+                }
+                //手机短信
+                else
+                {
+
+                }
+
+            }
+            else//管理用户登录
+            {
+                //查找改邮箱或者手机的用户
+                var exist = await _userRepository.AnyAsync(t => t.EMail == emailOrPhoneStr || t.Phone == emailOrPhoneStr);
+
+                if (!exist)
+                {
+                    return ResponseOutput.NotOk(verificationType == VerifyType.Email
+                        ? "No user with this email exists."
+                        : "No user with this phone exists.");
+
+                }
+                var user = await _userRepository.FirstOrDefaultAsync(t => t.EMail == emailOrPhoneStr || t.Phone == emailOrPhoneStr);
+                //邮箱
+                if (verificationType == VerifyType.Email)
+                {
+                    //验证码 6位
+                    int verificationCode = new Random().Next(100000, 1000000);
+
+                    await _mailVerificationService.SendMail(user.Id, user.LastName + ' ' + user.FirstName, emailOrPhoneStr,
+                        verificationCode);
+                }
+                //手机短信
+                else
+                {
+
+                }
+            }
+
+            return ResponseOutput.Ok();
+        }
+
+
+
+        /// <summary>
+        /// 验证设置新密码
+        /// </summary>
+        /// <param name="resetPwdModel"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Obsolete]
+        public async Task<IResponseOutput> SetNewPassword(ResetPasswordCommand resetPwdModel)
+        {
+            if (resetPwdModel.IsReviewer)
+            {
+                var emailOrPhoneStr = resetPwdModel.EmailOrPhone.Trim();
+                var verificationCodeStr = resetPwdModel.VerificationCode.Trim();
+                var user = await _doctorRepository.FirstOrDefaultAsync(t => t.EMail == emailOrPhoneStr || t.Phone == emailOrPhoneStr);
+
+                var verificationRecord = await _verificationCodeRepository
+                    .FirstOrDefaultAsync(t => t.UserId == user.Id && t.Code == verificationCodeStr && t.CodeType == resetPwdModel.VerificationType);
+
+                //检查数据库是否存在该验证码
+                if (verificationRecord == null)
+                {
+
+                    return ResponseOutput.NotOk("Verification code error");
+
+                }
+                else
+                {
+                    //检查验证码是否失效
+                    if (verificationRecord.ExpirationTime < DateTime.Now)
+                    {
+                        return ResponseOutput.NotOk("The verification code has expired");
+
+                    }
+                    else //验证码正确 并且 没有超时 
+                    {
+                        //更新密码
+                        var success = await _doctorRepository.UpdateFromQueryAsync(t => t.Id == user.Id, u => new Doctor()
+                        {
+                            Password = resetPwdModel.NewPwd
+                        });
+
+                        //删除验证码历史记录
+                        await _verificationCodeRepository.DeleteFromQueryAsync(t => t.UserId == user.Id && t.CodeType == resetPwdModel.VerificationType);
+
+                        return ResponseOutput.Result(success);
+
+                    }
+                }
+            }
+            else
+            {
+                var emailOrPhoneStr = resetPwdModel.EmailOrPhone.Trim();
+                var verificationCodeStr = resetPwdModel.VerificationCode.Trim();
+
+                var user = await _userRepository.FirstOrDefaultAsync(t => t.EMail == emailOrPhoneStr || t.Phone == emailOrPhoneStr);
+
+
+                var verificationRecord = await _verificationCodeRepository
+                    .FirstOrDefaultAsync(t => t.UserId == user.Id && t.Code == verificationCodeStr && t.CodeType == resetPwdModel.VerificationType);
+
+                //检查数据库是否存在该验证码
+                if (verificationRecord == null)
+                {
+
+                    return ResponseOutput.NotOk("Verification code error");
+
+                }
+                else
+                {
+                    //检查验证码是否失效
+                    if (verificationRecord.ExpirationTime < DateTime.Now)
+                    {
+                        return ResponseOutput.NotOk("The verification code has expired");
+
+                    }
+                    else //验证码正确 并且 没有超时 
+                    {
+                        //更新密码
+                        //var pwd = MD5Helper.Md5(newPwd);
+                        //var count = _doctorRepository.Update<Doctor>().Where(t => t.Id == doctor.Id).Set(d => d.Password == pwd).ExecuteAffrows();
+
+                        var success = await _userRepository.UpdateFromQueryAsync(t => t.Id == user.Id, u => new User()
+                        {
+                            Password = resetPwdModel.NewPwd,
+                            PasswordChanged = true
+                        });
+
+                        //删除验证码历史记录
+                        await _verificationCodeRepository.DeleteFromQueryAsync(t => t.UserId == user.Id && t.CodeType == resetPwdModel.VerificationType);
+
+                        return ResponseOutput.Result(success);
+
+                    }
+                }
+            }
+
+        }
 
     }
 }

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

@@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Services
 
 
         /// <summary>
-        /// 
+        /// Site用户列表导出
         /// </summary>
         /// <param name="trialId"></param>
         /// <param name="isAllSiteUser">isAllSiteUser true ： site用户列表，false ：Site调研汇总表</param>
@@ -80,7 +80,6 @@ namespace IRaCIS.Core.Application.Services
                    .GroupBy(t => t.SiteId)
                    .Select(g => g.OrderByDescending(u => u.CreateTime).Select(t => t.Id).First());
 
-
                 var query = _trialSiteUserSurveyRepository
                     .Where(t => groupSelectIdQuery.Contains(t.TrialSiteSurveyId))
                     .ProjectTo<TrialSiteUserSummaryDto>(_mapper.ConfigurationProvider);
@@ -122,7 +121,7 @@ namespace IRaCIS.Core.Application.Services
                               .WhereIf(param.IsDeleted != null, t => t.IsDeleted == param.IsDeleted)
                              .WhereIf(!string.IsNullOrWhiteSpace(param.SiteName), t => t.Site.SiteName.Contains(param.SiteName))
                              .WhereIf(!string.IsNullOrWhiteSpace(param.TrialSiteAliasName), t => t.TrialSiteAliasName.Contains(param.TrialSiteAliasName))
-                             .WhereIf(!string.IsNullOrWhiteSpace(param.TrialSiteCode), t => t.TrialSiteAliasName.Contains(param.TrialSiteCode))
+                             .WhereIf(!string.IsNullOrWhiteSpace(param.TrialSiteCode), t => t.TrialSiteCode.Contains(param.TrialSiteCode))
                              .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator, t => t.CRCUserList.Any(k => k.UserId == _userInfo.Id))
                              .WhereIf(!string.IsNullOrWhiteSpace(param.UserKeyInfo), t => t.CRCUserList.Any(k => (k.User.LastName + " / " + k.User.FirstName).Contains(param.UserKeyInfo)
                              || k.User.UserName.Contains(param.UserKeyInfo) || k.User.EMail.Contains(param.UserKeyInfo)))
@@ -145,7 +144,7 @@ namespace IRaCIS.Core.Application.Services
                              .WhereIf(param.IsDeleted != null, t => t.IsDeleted == param.IsDeleted)
                             .WhereIf(!string.IsNullOrWhiteSpace(param.SiteName), t => t.Site.SiteName.Contains(param.SiteName))
                             .WhereIf(!string.IsNullOrWhiteSpace(param.TrialSiteAliasName), t => t.TrialSiteAliasName.Contains(param.TrialSiteAliasName))
-                             .WhereIf(!string.IsNullOrWhiteSpace(param.TrialSiteCode), t => t.TrialSiteAliasName.Contains(param.TrialSiteCode))
+                             .WhereIf(!string.IsNullOrWhiteSpace(param.TrialSiteCode), t => t.TrialSiteCode.Contains(param.TrialSiteCode))
                             .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator, t => t.CRCUserList.Any(k => k.UserId == _userInfo.Id))
                              .WhereIf(!string.IsNullOrWhiteSpace(param.UserKeyInfo), t => t.CRCUserList.Any(k => (k.User.LastName + " / " + k.User.FirstName).Contains(param.UserKeyInfo)
                              || k.User.UserName.Contains(param.UserKeyInfo) || k.User.EMail.Contains(param.UserKeyInfo)))