Index: ssts-web/src/main/webapp/common/includeExtJsAndCss.jsp
===================================================================
diff -u -r29462 -r29465
--- ssts-web/src/main/webapp/common/includeExtJsAndCss.jsp	(.../includeExtJsAndCss.jsp)	(revision 29462)
+++ ssts-web/src/main/webapp/common/includeExtJsAndCss.jsp	(.../includeExtJsAndCss.jsp)	(revision 29465)
@@ -43,7 +43,7 @@
 if(enableFileSystemObject && !cookie_enableFileSystemObject){
 	alert('fso参数未正确写入cookie，请修改安全设置!');
 }
-var userName = '${userName}';
+var userNameID = '${userName}';
 enableFileSystemObject = enableFileSystemObject || cookie_enableFileSystemObject;
 //alert('enableFileSystemObject2='+enableFileSystemObject)
 //覆盖extJs2的占位图片路径
Index: ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js
===================================================================
diff -u -r29462 -r29465
--- ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js	(.../showModifyPWDWindowByExt.js)	(revision 29462)
+++ ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js	(.../showModifyPWDWindowByExt.js)	(revision 29465)
@@ -62,7 +62,7 @@
 			return false;
 		}
 		//暂时屏蔽验证复杂密码
-		var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue(),userName)
+		var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue(),userNameID)
 		if (!checkPasswordResult.success) {
 			Ext.MessageBox.show({
 				title : '错误提示',
Index: ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js
===================================================================
diff -u -r29462 -r29465
--- ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js	(.../showModifyPWDWindowByUnmodified.js)	(revision 29462)
+++ ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js	(.../showModifyPWDWindowByUnmodified.js)	(revision 29465)
@@ -58,7 +58,7 @@
 			});
 			return false;
 		}
-		var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue(),userName)
+		var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue(),userNameID)
 		if (!checkPasswordResult.success) {
 			Ext.MessageBox.show({
 				title : '错误提示',
Index: ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js
===================================================================
diff -u -r29462 -r29465
--- ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js	(.../modifyPWDByExt.js)	(revision 29462)
+++ ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js	(.../modifyPWDByExt.js)	(revision 29465)
@@ -60,7 +60,7 @@
     		return false;
     	}
         //暂时屏蔽验证复杂密码
-    	var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue(),userName)
+    	var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue(),userNameID)
     	if(!checkPasswordResult.success){
     		Ext.MessageBox.show({title:'错误提示', msg:checkPasswordResult.msg, buttons:Ext.Msg.OK,icon:Ext.Msg.ERROR});
     		return false;