Index: ssts-web/src/main/webapp/logon.jsp
===================================================================
diff -u -r40740 -r40743
--- ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 40740)
+++ ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 40743)
@@ -692,11 +692,7 @@
 		return
 	}
 
-	if(sstsConfig.enablePeriodicLoginPasswordChange){
-		isModifiedPwdByUser();
-	}else {
-		needModifyPwd();
-	}
+	needModifyPwd();
 	hideBox3();
 }
 
@@ -705,7 +701,7 @@
 	if(modifyPWDWindow){
 		return
 	}
-	if(sstsConfig.needForceModifyPwdWhenFirstTime || sstsConfig.forceUserChangePwdWhenNotMeetPwdComplexityReq){
+	if(sstsConfig.needForceModifyPwdWhenFirstTime || sstsConfig.forceUserChangePwdWhenNotMeetPwdComplexityReq || sstsConfig.enablePeriodicLoginPasswordChange){
 		var loginPassword = sessionStorage.getItem('loginPassword') || '';
 		var loginUserName = sessionStorage.getItem('loginUserName') || '';
 		$.ajax({
@@ -717,8 +713,14 @@
 				"userName":loginUserName
 			},
 			success : function(result) {
-				if(!result){
+				if(result.meetPwdComplexity){
 					showModifyPWDWindowByUnmodified();
+				}else if(result.passwdIsExpired){
+					top.Ext.Msg.confirm('请确认', '当前账户密码已经过期，是否前往修改？', function (btn) {
+						if (btn == 'yes') {
+							showModifyPWDWindowByUnmodified();
+						}
+					})
 				}else {
 					document.loginForm.submit();
 				}
@@ -729,24 +731,6 @@
 	}
 }
 
-//QYSRMYY-76：检查用户密码是否过期功能
-function isModifiedPwdByUser(){
-	if(sstsConfig.enablePeriodicLoginPasswordChange){
-		$.ajax({
-			type:'post',
-			dataType:'json',
-			url :  '${ctx}/systemmanage/user/userAction!isModifiedPwdByUser.do',
-			success : function(result) {
-				if(result.passwdIsExpired){
-					showModifyPWDWindowByUnmodified();
-					return
-				}
-				needModifyPwd();
-			}
-		});
-	}
-}
-
 //得到随机的颜色值
 function randomColor() {
 	var r = Math.floor(Math.random() * 256);
@@ -1050,11 +1034,7 @@
 		if(sstsConfig.loginTwoFactorAuthenticationType == 1){
 			alertBox3()
 		}else {
-			if(sstsConfig.enablePeriodicLoginPasswordChange){
-				isModifiedPwdByUser();
-			}else {
-				needModifyPwd();
-			}
+			needModifyPwd();
 		}
 	}