From 703743d85a7ebd86d5deec3cec594882c7e13424 Mon Sep 17 00:00:00 2001 From: Hanpaopao <510423039@qq.com> Date: Wed, 2 Apr 2025 21:06:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=9C=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Users/UserAppService.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Users/UserAppService.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Users/UserAppService.cs index f741099d..396ca5e7 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Users/UserAppService.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Users/UserAppService.cs @@ -4,6 +4,7 @@ using Magicodes.ExporterAndImporter.Excel; using Magicodes.ExporterAndImporter.Excel.AspNetCore; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; +using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical; using Volo.Abp.Account; using Volo.Abp.Auditing; using Volo.Abp.Uow; @@ -240,7 +241,7 @@ namespace Lion.AbpPro.BasicManagement.Users public virtual async Task NeedChangePasswordAsync() { var result = new NeedChangePasswordOutput(); - // 获取设置 + // 获取首次修改密码设置 var value = await _settingProvider.GetOrNullAsync(BasicManagementConsts.EnableNewAccountRequiredChangePassword); bool.TryParse(value, out var convertValue); if (!convertValue) return result; @@ -256,6 +257,12 @@ namespace Lion.AbpPro.BasicManagement.Users return result; } + // 获取定期修改密码设置 + var expireValue = await _settingProvider.GetOrNullAsync(BasicManagementConsts.EnableExpireRequiredChangePassword); + bool.TryParse(expireValue, out var expire); + + if (!expire) return result; + var lastChangePasswordTime = user.GetLastChangePasswordTime(); if (!lastChangePasswordTime.HasValue) return result; @@ -263,6 +270,7 @@ namespace Lion.AbpPro.BasicManagement.Users var expireDays = await _settingProvider.GetOrNullAsync(BasicManagementConsts.PasswordExpireDay); int.TryParse(expireDays, out var expireDay); + // 获取过期提醒天数 var remindDays = await _settingProvider.GetOrNullAsync(BasicManagementConsts.PasswordRemindDay); int.TryParse(remindDays, out var remindDay);