Index: ssts-web/src/main/webapp/logon.jsp
===================================================================
diff -u -r40917 -r40928
--- ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 40917)
+++ ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 40928)
@@ -1028,7 +1028,7 @@
 				}
 				alertBox1(userName,result.phoneNumber);
 			}else {
-				alert(result.message);
+				showResult(result.message);
 			}
         }
     });
@@ -1160,7 +1160,7 @@
 			alertBox3()
 		}else {
 			//ZSYY-438：短信验证
-			if(sstsConfig.needBeStrongPwdWhenModifyPwd && sstsConfig.enableTwoFactorAuthentication == 1){
+			if(sstsConfig.needBeStrongPwdWhenModifyPwd && sstsConfig.enableTwoFactorAuthentication == 1 && !isValidBarcode(j_username_display.value)){
 				var checkPasswordResult = testPasswordReg(j_password_display.value,j_username_display.value);
 				if (checkPasswordResult.success) {
 					needModifyPwd();