Index: ssts-web/src/main/webapp/logon.jsp
===================================================================
diff -u -r40640 -r40643
--- ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 40640)
+++ ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 40643)
@@ -356,7 +356,7 @@
 		height:logoHeight+'px'
 	})
 }
-
+var modifyPWDWindow = null;
 //GZSZYY-121：弹出修改密码的窗口
 function showModifyPWDWindowByUnmodified() {
 	var publicKey = "<%=logonRSAPublicKey %>";
@@ -434,7 +434,6 @@
 				}]
 			}]
 		}],
-
 		buttons : [{
 			id : 'saveBtn',
 			text : '确认',
@@ -507,7 +506,7 @@
 		});
 	}
 	
-	var window = new top.Ext.Window( {
+	modifyPWDWindow = new top.Ext.Window( {
 		id : 'modifyPWDWindow',
 		layout : 'fit',
 		title : '修改密码',
@@ -518,10 +517,14 @@
 		plain : true,
 		modal:true,
 		closeAction:'close',
-		items : [ formObj ]
+		items : [ formObj ],
+		listeners: {
+	        beforeClose: function (sender, handlers) {
+				modifyPWDWindow = null;
+	        }
+		}
 	});
-	
-	window.show();
+	modifyPWDWindow.show();
 	top.Ext.getCmp("oldPassword").focus(false, 100);
 	if(msg !== ''){
 		top.Ext.getCmp('showPwdMessage').el.dom.style.color = 'red';
@@ -695,6 +698,9 @@
 
 //GZSZYY-121：强制修改密码
 function needModifyPwd(){
+	if(modifyPWDWindow){
+		return
+	}
 	if(sstsConfig.needForceModifyPwdWhenFirstTime || sstsConfig.forceUserChangePwdWhenNotMeetPwdComplexityReq){
 		var loginPassword = sessionStorage.getItem('loginPassword') || '';
 		var loginUserName = sessionStorage.getItem('loginUserName') || '';
@@ -730,16 +736,19 @@
 //关闭验证码的窗口
 function hideBox1(){
 	ab1.close();
+	ab1 = null;
 }
 
 //关闭重置密码的窗口
 function hideBox2(){
 	ab2.close();
+	ab2 = null;
 }
 
 //关闭二次验证的窗口
 function hideBox3(){
 	ab3.close();
+	ab3 = null;
 }
 
 //忘记密码