From 76a9a997626e2bd0bea32068a4ab12c7893d50a7 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 1 Dec 2023 15:41:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/Management/UserService.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index 32c0e11f1..2606ad5b0 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -646,7 +646,8 @@ namespace IRaCIS.Application.Services
             {
                 await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = Guid.Empty, OptUserId = Guid.Empty, LoginFaildName = userName,LoginPassword=password,  OptType = UserOptType.AccountLocked }, true);
 
-                throw new BusinessValidationFailedException($"密码连续错误{maxFailures}次,当前账号已被限制登录，请等待 {lockoutMinutes} 分钟后再试。");
+                //$"密码连续错误{maxFailures}次,当前账号已被限制登录，请等待 {lockoutMinutes} 分钟后再试。"
+                throw new BusinessValidationFailedException(_localizer["User_ErrorLimit", maxFailures, lockoutMinutes]);
             }
 
             var userLoginReturnModel = new LoginReturnDTO();

From 9f5ae6f897559345cfc16a9ddfc57546f46677fb Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 1 Dec 2023 15:58:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?CRA=20=20=E4=B8=8D=E8=83=BD=E7=AD=BE?=
 =?UTF-8?q?=E5=90=8D=EF=BC=8C=E9=9C=80=E8=A6=81=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs b/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs
index 555e3aa35..eb0a2ef1c 100644
--- a/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs
+++ b/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs
@@ -56,7 +56,7 @@ namespace IRaCIS.Core.Application.Filter
             #region 处理新的用户类型，不能操作项目相关接口
 
             // 后期列举出具体的类型，其他任何用户类型，都不允许操作
-            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA)
+            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA && _userInfo.RequestUrl.ToLower()!= "TrialDocument/userConfirm")
             {
                 //---对不起，您的账户没有操作权限。
                 context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_NoAccessPermission"]));

From 2509d9cd9bce8ce8804994e68a8f1d6af371f669 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 1 Dec 2023 16:03:48 +0800
Subject: [PATCH 3/3] =?UTF-8?q?CRA=20=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs b/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs
index eb0a2ef1c..f7dfe2583 100644
--- a/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs
+++ b/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs
@@ -56,7 +56,7 @@ namespace IRaCIS.Core.Application.Filter
             #region 处理新的用户类型，不能操作项目相关接口
 
             // 后期列举出具体的类型，其他任何用户类型，都不允许操作
-            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA && _userInfo.RequestUrl.ToLower()!= "TrialDocument/userConfirm")
+            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA && _userInfo.RequestUrl.ToLower()!= "TrialDocument/userConfirm".ToLower())
             {
                 //---对不起，您的账户没有操作权限。
                 context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_NoAccessPermission"]));