Index: ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java
===================================================================
diff -u -r27747 -r29171
--- ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java	(.../UserTableManager.java)	(revision 27747)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java	(.../UserTableManager.java)	(revision 29171)
@@ -132,7 +132,7 @@
 			return userName;
 		User user = sysUserManager.getUserByproperty("id", Long
 				.valueOf(keyId));
-		return user.getFullName();
+		return user.getFullName()+ "," + user.getName();
 	}
 
 	public boolean isRepeatLogninId(String id, String loginId) {
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r29169 -r29171
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 29169)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 29171)
@@ -2163,6 +2163,8 @@
     		var tempLoginUser = loginUser.toLowerCase();
     		if(passwordNotContainLoginName && tempPwd.indexOf(tempLoginUser) == 0){
         		obj.msg = "密码不可以包含账号!";
+    		}else{
+    			obj.success = true;
     		}
     	}else{
     		obj.success = true;
Index: ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js
===================================================================
diff -u -r29170 -r29171
--- ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js	(.../adminModifyPWDByExt.js)	(revision 29170)
+++ ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js	(.../adminModifyPWDByExt.js)	(revision 29171)
@@ -6,9 +6,9 @@
         alert("请输入新密码！");
         return false;
     }
-	var loginUser = $Id("userName").value;
+	var loginUserName = $Id("loginUserName").value;
     //暂时屏蔽验证复杂密码
-	var checkPasswordResult = testPasswordReg(newPassword, loginUser);
+	var checkPasswordResult = testPasswordReg(newPassword, loginUserName);
 	if(!checkPasswordResult.success){
 		alert(checkPasswordResult.msg);
 		return false;
@@ -53,7 +53,8 @@
 }
 
 function showUserName(userName){
-	Ext.getCmp('userName').setValue(userName);
+	Ext.getCmp('userName').setValue(userName.split(',')[0]);
+	Ext.getCmp('loginUserName').setValue(userName.split(',')[1]);
 }
 		
 
@@ -80,6 +81,10 @@
                 readOnly : true,
                 cls:'fieldReadOnlyNoRemove'
             },{
+                xtype:'hidden',
+                id :'loginUserName',
+                name :'loginUserName'
+            },{
                 xtype:'textfield',
                 fieldLabel :'新密码',
                 id :'newPassword',