Index: ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js
===================================================================
diff -u -r28961 -r29462
--- ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js	(.../showModifyPWDWindowByExt.js)	(revision 28961)
+++ ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js	(.../showModifyPWDWindowByExt.js)	(revision 29462)
@@ -62,7 +62,7 @@
 			return false;
 		}
 		//暂时屏蔽验证复杂密码
-		var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue())
+		var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue(),userName)
 		if (!checkPasswordResult.success) {
 			Ext.MessageBox.show({
 				title : '错误提示',
Index: ssts-web/src/main/webapp/systemmanage/userFormExt.js
===================================================================
diff -u -r29332 -r29462
--- ssts-web/src/main/webapp/systemmanage/userFormExt.js	(.../userFormExt.js)	(revision 29332)
+++ ssts-web/src/main/webapp/systemmanage/userFormExt.js	(.../userFormExt.js)	(revision 29462)
@@ -64,7 +64,7 @@
 			Ext.getCmp('confirmpwd').setValue("");
 			return false;
         } 
-        var checkPasswordResult = testPasswordReg(passwdValue)
+        var checkPasswordResult = testPasswordReg(passwdValue,Ext.getCmp('name').getValue())
     	if(!checkPasswordResult.success){
     		Ext.MessageBox.show({title:'错误提示', msg:checkPasswordResult.msg, buttons:Ext.Msg.OK,icon:Ext.Msg.ERROR});
     		return false;
Index: ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js
===================================================================
diff -u -r28961 -r29462
--- ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js	(.../modifyPWDByExt.js)	(revision 28961)
+++ ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js	(.../modifyPWDByExt.js)	(revision 29462)
@@ -59,8 +59,8 @@
     		Ext.MessageBox.show({title:'错误提示', msg:'请正确填写表单各值。',buttons:Ext.Msg.OK,icon:Ext.Msg.ERROR});
     		return false;
     	}
-    	//暂时屏蔽验证复杂密码
-    	var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue())
+        //暂时屏蔽验证复杂密码
+    	var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue(),userName)
     	if(!checkPasswordResult.success){
     		Ext.MessageBox.show({title:'错误提示', msg:checkPasswordResult.msg, buttons:Ext.Msg.OK,icon:Ext.Msg.ERROR});
     		return false;
Index: ssts-web/src/main/webapp/common/includeExtJsAndCss.jsp
===================================================================
diff -u -r28016 -r29462
--- ssts-web/src/main/webapp/common/includeExtJsAndCss.jsp	(.../includeExtJsAndCss.jsp)	(revision 28016)
+++ ssts-web/src/main/webapp/common/includeExtJsAndCss.jsp	(.../includeExtJsAndCss.jsp)	(revision 29462)
@@ -24,6 +24,7 @@
 if(loginUserData != null){
 	messagePromptType = loginUserData.getMessagePromptType();
 	session.setAttribute("messagePromptType", messagePromptType);
+	session.setAttribute("userName",loginUserData.getUserName());
 }
 boolean enableFSO = WebConstants.ENABLE_FILE_SYSTEM_OBJECT.equals(session.getAttribute(WebConstants.ACCESS_FILE_SYSTEM_OBJECT_FLAG));
 
@@ -42,6 +43,7 @@
 if(enableFileSystemObject && !cookie_enableFileSystemObject){
 	alert('fso参数未正确写入cookie，请修改安全设置!');
 }
+var userName = '${userName}';
 enableFileSystemObject = enableFileSystemObject || cookie_enableFileSystemObject;
 //alert('enableFileSystemObject2='+enableFileSystemObject)
 //覆盖extJs2的占位图片路径
Index: ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js
===================================================================
diff -u -r28961 -r29462
--- ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js	(.../showModifyPWDWindowByUnmodified.js)	(revision 28961)
+++ ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js	(.../showModifyPWDWindowByUnmodified.js)	(revision 29462)
@@ -58,7 +58,7 @@
 			});
 			return false;
 		}
-		var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue())
+		var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue(),userName)
 		if (!checkPasswordResult.success) {
 			Ext.MessageBox.show({
 				title : '错误提示',