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: "安全提示",