Index: ssts-web/src/main/webapp/logon.jsp
===================================================================
diff -u -r40928 -r41218
--- ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 40928)
+++ ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 41218)
@@ -298,6 +298,7 @@
 			<span class="close"><a href="javascript:void(0)" onclick="hideBox3();">关闭</a></span>
 		</div>
 		<div class="showForm showForm3">
+			<input type="hidden" id="loginType" />
 			<p>本次登陆需要进行二次验证：</p>
 			<div class="canvasDiv">
 				<canvas class="canvas" id="canvas" width="150" height="50" onclick="drawVerifiyCode()"></canvas>
@@ -352,6 +353,7 @@
 var enalbeScanBarcodeLogin = true; //启用扫描条码登陆
 var clientComputerName = '${param.clientComputerName}';
 var ENABLE_SPEECH_RECOGNITION = '${ENABLE_SPEECH_RECOGNITION}';
+var login_error = '${param.login_error}';
 if(ENABLE_SPEECH_RECOGNITION){
 	// 保存到cookie
 	setCookie('ENABLE_SPEECH_RECOGNITION',ENABLE_SPEECH_RECOGNITION,10000*365);
@@ -684,7 +686,7 @@
 
 var show_num = [];
 //GZSZYY-83:二次验证
-function alertBox3(){
+function alertBox3(loginType){
 	if(!ab3){
 		ab3 = new AlertBox("idBox3",{
 			fixed:true,
@@ -695,6 +697,7 @@
 				var left = (clientWidth > 410)?(clientWidth - 410)/2:0;
 				var top = (clientHeight > 310)?(clientHeight - 310)/2:0;
 
+				document.getElementById('loginType').value = loginType || '';
 				document.getElementById('idBox3').style.left = left + 'px';
 				document.getElementById('idBox3').style.top = top + 'px';
 
@@ -753,7 +756,6 @@
 		context.stroke();
 	}
 }
-
 //判断验证码是否一样
 function verificationCode(){
 	var code = show_num.join('');
@@ -769,6 +771,11 @@
 	}
 
 	hideBox3();
+	var loginType = document.getElementById('loginType').value;
+	if(loginType == 'error'){
+		isBindPhone('', 'login')
+		return
+	}
 	//ZSYY-438：短信验证
 	if(sstsConfig.needBeStrongPwdWhenModifyPwd && sstsConfig.enableTwoFactorAuthentication == 1){
 		var checkPasswordResult = testPasswordReg(j_password_display.value,j_username_display.value);
@@ -889,6 +896,10 @@
 	validateAuthenticationCode(encryptedUserName, encryptedUserCode, 'login', function(res){
 		if(res.success){
 			ab1.close();
+			var loginType = document.getElementById("loginType").value;
+			if(loginType == 'error'){
+				return
+			}
 			//GZSZYY-83：登录二次验证类型
 			needModifyPwd();
 		}else {
@@ -901,6 +912,10 @@
 	sessionStorage.setItem('clientComputerName',clientComputerName)
 }
 
+if(sstsConfig.enablePasswordErrorVerificationOnLogin == 1 && login_error == '1'){
+	alertBox3('error');
+}
+
 //重置密码
 function resetPassword(){
 	var userName = document.getElementById("j_username_display").value;
@@ -1001,7 +1016,12 @@
 
 //验证是否绑定手机号
 function isBindPhone(userName, type){
-	var encryptedUserName = encrypt.encrypt(userName);
+	var encryptedUserName = '';
+	if(userName == ''){
+		encryptedUserName = sessionStorage.getItem('loginUserName');
+	}else {
+		encryptedUserName = encrypt.encrypt(userName);
+	}
 	$.ajax({
 	    type:'post',
 	    dataType:'json',