Index: ssts-web/src/main/webapp/logon.jsp
===================================================================
diff -u -r40744 -r40762
--- ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 40744)
+++ ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 40762)
@@ -481,11 +481,14 @@
 			waitTitle : '修改密码',
 			success : function(form, action) {
 				if (action.result && action.result.success) {
-					var confirmPwd = top.Ext.getCmp('newPassword').getValue()
-    				var encryptedPassword = encrypt.encrypt(confirmPwd);
-					sessionStorage.setItem('loginPassword',encryptedPassword);
-					sessionStorage.setItem('loginUserName',encryptedUserName);
-					document.loginForm.j_password.value = encryptedPassword;
+					var usernameValue = getUserName();
+					if(!isValidBarcode(usernameValue)){
+						var confirmPwd = top.Ext.getCmp('newPassword').getValue()
+    					var encryptedPassword = encrypt.encrypt(confirmPwd);
+						sessionStorage.setItem('loginPassword',encryptedPassword);
+						sessionStorage.setItem('loginUserName',encryptedUserName);
+						document.loginForm.j_password.value = encryptedPassword;
+					}
 					document.loginForm.submit();
 				} else {
 					top.Ext.MessageBox.show({