Index: ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js
===================================================================
diff -u -r22276 -r28961
--- ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js	(.../showModifyPWDWindowByUnmodified.js)	(revision 22276)
+++ ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js	(.../showModifyPWDWindowByUnmodified.js)	(revision 28961)
@@ -58,10 +58,11 @@
 			});
 			return false;
 		}
-		if (testPasswordReg(Ext.getCmp('newPassword').getValue())) {
+		var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue())
+		if (!checkPasswordResult.success) {
 			Ext.MessageBox.show({
 				title : '错误提示',
-				msg : '密码必须是数字与字母组合，长度不小于6！',
+				msg : checkPasswordResult.msg,
 				buttons : Ext.Msg.OK,
 				icon : Ext.Msg.ERROR
 			});