From 24ea9e097e8b3c4f642b8761f7ecac3c4d169d5d Mon Sep 17 00:00:00 2001 From: wangping <995664179@qq.com> Date: Fri, 19 Sep 2025 16:59:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=85=BC=E5=AE=B9APP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ATS.NonCustodial.Application/Impl/Admins/AuthService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/2.services/ATS.NonCustodial.Application/Impl/Admins/AuthService.cs b/src/2.services/ATS.NonCustodial.Application/Impl/Admins/AuthService.cs index c7a31dc..fa8166e 100644 --- a/src/2.services/ATS.NonCustodial.Application/Impl/Admins/AuthService.cs +++ b/src/2.services/ATS.NonCustodial.Application/Impl/Admins/AuthService.cs @@ -258,7 +258,7 @@ namespace ATS.NonCustodial.Application.Impl.Admins [NoOperationLog] public async Task LoginWithPhoneAsync(AuthLoginWithPhoneInput input) { - var user = await _appUserRepository.FindAsync(a => a.UnitId.Equals(input.UnitId) && (a.UserName == input.UserName || a.Phone == input.UserName) && a.DataStatus == DataStatusEnum.Normal && (a.ChatPersonType == ChatPersonTypeEnum.Admin || a.ChatPersonType == ChatPersonTypeEnum.Supervisor)); + var user = await _appUserRepository.FindAsync(a => (input.UnitId == null || a.UnitId.Equals(input.UnitId)) && (a.UserName == input.UserName || a.Phone == input.UserName) && a.DataStatus == DataStatusEnum.Normal && (a.ChatPersonType == ChatPersonTypeEnum.Admin || a.ChatPersonType == ChatPersonTypeEnum.Supervisor)); if (user == null) return ResultOutput.NotOk($"用户不存在,或者无权限登录!"); user.CId = input.CId; From cb5071bffb7ab9ed759dc86306a0250995636dc5 Mon Sep 17 00:00:00 2001 From: wangping <995664179@qq.com> Date: Mon, 22 Sep 2025 14:04:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?APP=E8=AE=A4=E8=AF=81=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CaseManagements/AppSupervisedPersonService.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/2.services/ATS.NonCustodial.Application/Impl/Business/CaseManagements/AppSupervisedPersonService.cs b/src/2.services/ATS.NonCustodial.Application/Impl/Business/CaseManagements/AppSupervisedPersonService.cs index a16d55c..cc01923 100644 --- a/src/2.services/ATS.NonCustodial.Application/Impl/Business/CaseManagements/AppSupervisedPersonService.cs +++ b/src/2.services/ATS.NonCustodial.Application/Impl/Business/CaseManagements/AppSupervisedPersonService.cs @@ -121,15 +121,17 @@ namespace ATS.NonCustodial.Application.Impl.Business.CaseManagements } //修改状态 + var propertyNameAndValues = new Dictionary>(); foreach (var (key, value) in caseProgress) { - await _appCaseManagementEfRepository.UpdateAsync(w => w.Id == key, - w => new AppCaseManagement() - { - CaseProgress = value, - CaseBeginTime = value == CaseProgressEnum.InExecution ? DateTime.Now : null - }); + propertyNameAndValues[key] = new List<(string propertyName, dynamic propertyValue)>() + { + (nameof(AppCaseManagement.CaseProgress), value), + (nameof(AppCaseManagement.CaseBeginTime), value == CaseProgressEnum.InExecution ? DateTime.Now : (DateTime?)null) + }; } + + await _appCaseManagementEfRepository.UpdateAsync(propertyNameAndValues); return ResultOutput.Ok(); } From 8c38a8e2e5f32d824d37d520512fb1684b58f997 Mon Sep 17 00:00:00 2001 From: wangping <995664179@qq.com> Date: Mon, 22 Sep 2025 15:48:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?GetToken=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=85=BC=E5=AE=B9APP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ATS.NonCustodial.Application/Impl/Admins/AuthService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/2.services/ATS.NonCustodial.Application/Impl/Admins/AuthService.cs b/src/2.services/ATS.NonCustodial.Application/Impl/Admins/AuthService.cs index fa8166e..326534b 100644 --- a/src/2.services/ATS.NonCustodial.Application/Impl/Admins/AuthService.cs +++ b/src/2.services/ATS.NonCustodial.Application/Impl/Admins/AuthService.cs @@ -421,15 +421,15 @@ namespace ATS.NonCustodial.Application.Impl.Admins { new Claim(ClaimAttributes.userId, user.Id.ToString()), new Claim(ClaimAttributes.userName, user.UserName!), - new Claim(ClaimAttributes.userUnitId, user.UnitId.ToString()), - new Claim(ClaimAttributes.userDeptcodeId, user.DeptcodeId.ToString()), + new Claim(ClaimAttributes.userUnitId, user.UnitId?.ToString() ?? ""), + new Claim(ClaimAttributes.userDeptcodeId, user.DeptcodeId?.ToString()??""), new Claim(ClaimAttributes.userNickName, user?.NickName??"") , new Claim(ClaimAttributes.avatar,user?.Avatar??"") , new Claim(ClaimAttributes.roles,JsonConvert.SerializeObject(roles)), new Claim(ClaimAttributes.orgs,JsonConvert.SerializeObject(Array.Empty())) , new Claim(ClaimAttributes.phone,user?.Phone??""), new Claim(ClaimAttributes.logtime,timeLogin), - new Claim(ClaimAttributes.limits,limits), + new Claim(ClaimAttributes.limits,limits??""), new Claim(ClaimAttributes.IsAdmin,user.IsAdmin?"true":"false"), new Claim(ClaimAttributes.personType,user?.ChatPersonType.ToString()!) });