优化密码策略提示优先顺序

11 months ago · 4c74687ca2
parent 9f48d2bbe8
commit 4c74687ca2
2 changed files with 2 additions and 2 deletions
--- 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: "安全提示",
--- 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: "安全提示",