Index: ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js
===================================================================
diff -u -r40882 -r40883
--- ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js	(.../showModifyPWDWindowByExt.js)	(revision 40882)
+++ ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js	(.../showModifyPWDWindowByExt.js)	(revision 40883)
@@ -139,22 +139,6 @@
 			});
 			return false;
 		}
-		if (sstsConfig.needBeStrongPwdWhenModifyPwd && sstsConfig.enableTwoFactorAuthentication) {
-			var verificationCode = Ext.getCmp('verificationCode').getValue();
-			var encryptedUserCode = encrypt.encrypt(verificationCode);
-			validateAuthenticationCode(encryptedUserName, encryptedUserCode, function (res) {
-				if (res.success) {
-					save();
-				} else {
-					showResult(res.message);
-				}
-			})
-		} else {
-			save();
-		}
-	}
-
-	function save() {
 		//暂时屏蔽验证复杂密码
 		var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue(), userNameID)
 		if (!checkPasswordResult.success) {
@@ -176,6 +160,22 @@
 			});
 			return false;
 		}
+		if (sstsConfig.needBeStrongPwdWhenModifyPwd && sstsConfig.enableTwoFactorAuthentication) {
+			var verificationCode = Ext.getCmp('verificationCode').getValue();
+			var encryptedUserCode = encrypt.encrypt(verificationCode);
+			validateAuthenticationCode(encryptedUserName, encryptedUserCode, function (res) {
+				if (res.success) {
+					save();
+				} else {
+					showResult(res.message);
+				}
+			})
+		} else {
+			save();
+		}
+	}
+
+	function save() {
 		formObj.form.submit({
 			url: WWWROOT + '/personalSetting/modifyPWDByExt/save.do',
 			method: 'POST',