From 4dafe15386988eab624e4583d334c05f748761f9 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 21 Aug 2023 16:59:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/wwwroot/swagger/ui/abp.swagger.js | 12 +++++++++--- IRaCIS.Core.Application/Service/QC/QCListService.cs | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.API/wwwroot/swagger/ui/abp.swagger.js b/IRaCIS.Core.API/wwwroot/swagger/ui/abp.swagger.js index 30ec9c833..cf36aa096 100644 --- a/IRaCIS.Core.API/wwwroot/swagger/ui/abp.swagger.js +++ b/IRaCIS.Core.API/wwwroot/swagger/ui/abp.swagger.js @@ -276,8 +276,10 @@ var abp = abp || {}; } var password = document.getElementById('password').value; - if (!password) { - alert('PassWord Can Not Be Null'); + var pwdMd5 = document.getElementById('pwdMd5').value; + console.log(pwdMd5); + if (!password && !pwdMd5) { + alert('PassWord And Md5 Can Not Be Null'); return false; } @@ -321,6 +323,9 @@ var abp = abp || {}; UserName: usernameOrEmailAddress, Password: hex_md5(password), } + if (pwdMd5 != '') { + parm.Password = pwdMd5; + } xhr.send(JSON.stringify(parm)); //xhr.send("{" + "userName:'" + usernameOrEmailAddress + "'," + "passWord:'" + password + "'}"); @@ -415,7 +420,8 @@ var abp = abp || {}; //Inputs createInput(modalUxContent, 'tenancyName', 'Tenancy Name (Leave empty for Host)'); createInput(modalUxContent, 'userName', 'Username or email address','text','cyldev'); - createInput(modalUxContent, 'password', 'Password','password','123456'); + createInput(modalUxContent, 'password', 'Password', 'password', '123456'); + createInput(modalUxContent, 'pwdMd5', 'PwdMd5', 'text', ''); //Buttons var authBtnWrapper = document.createElement('div'); diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs index 67b6bb451..b646d8e46 100644 --- a/IRaCIS.Core.Application/Service/QC/QCListService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs @@ -451,7 +451,7 @@ namespace IRaCIS.Core.Application.Image.QA //.WhereIf(visitSearchDTO.ChallengeState != null, t => t.ChallengeState == visitSearchDTO.ChallengeState) .ProjectTo(_mapper.ConfigurationProvider); - var defalutSortArray = new string[] { nameof(SubjectVisit.IsUrgent) + " desc", nameof(SubjectVisit.SubjectId), nameof(SubjectVisit.VisitNum) }; + var defalutSortArray = new string[] { nameof(SubjectVisit.IsUrgent) + " desc", nameof(QCVisitViewModel.AuditState) }; var pageList = await query.ToPagedListAsync(visitSearchDTO.PageIndex, visitSearchDTO.PageSize, visitSearchDTO.SortField, visitSearchDTO.Asc, string.IsNullOrWhiteSpace(visitSearchDTO.SortField), defalutSortArray);