diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index 9a2f498..c49cc14 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs @@ -455,7 +455,7 @@ namespace IRaCIS.Core.API.Controllers var patinetid = info.IsAnalysisCreate == true ? info.BlindSubjectCode : info.SubjectCode; // 创建一个唯一的ZIP文件名 - var zipFileName = $"{patinetid.Replace(" ", "")}_{info.TaskName.Replace(" ", "")}_{DateTime.Now:yyyyMMddHHmmss}.zip"; + var zipFileName = $"{patinetid.Replace(" ", "")}_{info.TaskName.Replace(" ", "_")}.zip"; var tempStoreFolder = Path.Combine(FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment), StaticData.Folder.TempFileFolder); diff --git a/IRaCIS.Core.Application/Resources/en-US.json b/IRaCIS.Core.Application/Resources/en-US.json index 81f5dad..01aee1d 100644 --- a/IRaCIS.Core.Application/Resources/en-US.json +++ b/IRaCIS.Core.Application/Resources/en-US.json @@ -41,7 +41,7 @@ "User_VerificationCodeExpired": "The verification code has expired.", "User_CreateFailed": "Check the email address or contact maintainers. The email fails to be sent and the account cannot be created.", "User_InvalidEmail": "Please enter a correct email address.", - "User_EmailError": "The email adress is wrong.", + "User_EmailError": "The email address is not linked to any user account.", "User_InProject": "The user has participated in the project and cannot be deleted.", "User_Disabled": "The user has been disabled.", //UserTypeService diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index b2227f0..1f9d84f 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -615,7 +615,7 @@ namespace IRaCIS.Application.Services var userLoginReturnModel = new LoginReturnDTO(); - var loginUser = await _userRepository.Where(u => u.UserName.Equals(userName) && u.Password == password).ProjectTo(_mapper.ConfigurationProvider).FirstOrDefaultAsync(); + var loginUser = await _userRepository.Where(u => u.UserName== userName && u.Password == password).ProjectTo(_mapper.ConfigurationProvider).FirstOrDefaultAsync(); if (loginUser == null) {