From 4c74687ca27ec76b028d70503f73d44e9a9b01f8 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 28 May 2025 09:47:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=86=E7=A0=81=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E6=8F=90=E7=A4=BA=E4=BC=98=E5=85=88=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/templates/index-topnav.html | 2 +- ruoyi-admin/src/main/resources/templates/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/index-topnav.html b/ruoyi-admin/src/main/resources/templates/index-topnav.html index 6c198b8d9..00422f224 100644 --- a/ruoyi-admin/src/main/resources/templates/index-topnav.html +++ b/ruoyi-admin/src/main/resources/templates/index-topnav.html @@ -438,7 +438,7 @@ $(function() { } /* 过期密码提示 */ - if([[${isPasswordExpired}]]) { + if(![[${isDefaultModifyPwd}]] && [[${isPasswordExpired}]]) { layer.confirm("您的密码已过期，请尽快修改密码！", { icon: 0, title: "安全提示", diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index bed4178a5..272c01286 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -374,7 +374,7 @@ $(function() { } /* 过期密码提示 */ - if([[${isPasswordExpired}]]) { + if(![[${isDefaultModifyPwd}]] && [[${isPasswordExpired}]]) { layer.confirm("您的密码已过期，请尽快修改密码！", { icon: 0, title: "安全提示",