Index: ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js
===================================================================
diff -u -r28961 -r29170
--- ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js	(.../adminModifyPWDByExt.js)	(revision 28961)
+++ ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js	(.../adminModifyPWDByExt.js)	(revision 29170)
@@ -6,8 +6,9 @@
         alert("请输入新密码！");
         return false;
     }
+	var loginUser = $Id("userName").value;
     //暂时屏蔽验证复杂密码
-	var checkPasswordResult = testPasswordReg(newPassword);
+	var checkPasswordResult = testPasswordReg(newPassword, loginUser);
 	if(!checkPasswordResult.success){
 		alert(checkPasswordResult.msg);
 		return false;
@@ -16,12 +17,6 @@
         alert('请输入确认新密码！');
         return false;
     }
-     //暂时屏蔽验证复杂密码
-    var checkPasswordResult = testPasswordReg(newPassword);
-    if(!checkPasswordResult.success){
-		alert(checkPasswordResult.msg);
-		return false;
-	}
     if (newPassword != confirmNewPassword) {
     	alert("新密码与确认新密码不一致！");
         return false;