Index: ssts-web/src/main/webapp/logon.jsp
===================================================================
diff -u -r41218 -r41220
--- ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 41218)
+++ ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 41220)
@@ -891,7 +891,13 @@
 	//GZSZYY-83：登录二次验证类型
 	var userName = document.getElementById("j_username_display").value;
 	var userCode = document.getElementById("userCode").value;
-	var encryptedUserName = encrypt.encrypt(userName);
+	var loginType = document.getElementById("loginType").value;
+	var encryptedUserName = '';
+	if(loginType == 'error' && userName == ''){
+		encryptedUserName = sessionStorage.getItem('loginUserName');
+	}else {
+		encryptedUserName = encrypt.encrypt(userName);
+	}
 	var encryptedUserCode = encrypt.encrypt(userCode);
 	validateAuthenticationCode(encryptedUserName, encryptedUserCode, 'login', function(res){
 		if(res.success){
@@ -983,11 +989,17 @@
 
 function sendCodeBySms(that){
 	var userName = document.getElementById("j_username_display").value;
+	var loginType = document.getElementById('loginType').value;
+	var encryptedUserName = '';
+	if(loginType == 'error' && userName == ''){
+		encryptedUserName = sessionStorage.getItem('loginUserName');
+	}
 	if(userName == ''){
 		alert('用户名不存在');
 		return;
+	}else {
+		encryptedUserName = encrypt.encrypt(userName);
 	}
-	var encryptedUserName = encrypt.encrypt(userName);
 	sendAuthenticationCodeSms(encryptedUserName, 'login',function(res){
 		if(res.success){
 			showResult(res.message);