Index: ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js
===================================================================
diff -u -r22262 -r28961
--- ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js	(.../adminModifyPWDByExt.js)	(revision 22262)
+++ ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js	(.../adminModifyPWDByExt.js)	(revision 28961)
@@ -7,17 +7,19 @@
         return false;
     }
     //暂时屏蔽验证复杂密码
-	if(testPasswordReg(newPassword)){
-		alert("密码必须是数字与字母组合，长度不小于6");
+	var checkPasswordResult = testPasswordReg(newPassword);
+	if(!checkPasswordResult.success){
+		alert(checkPasswordResult.msg);
 		return false;
 	}
     if (confirmNewPassword == ""){
         alert('请输入确认新密码！');
         return false;
     }
      //暂时屏蔽验证复杂密码
-    if(testPasswordReg(newPassword)){
-		alert("密码必须是数字与字母组合，长度不小于6");
+    var checkPasswordResult = testPasswordReg(newPassword);
+    if(!checkPasswordResult.success){
+		alert(checkPasswordResult.msg);
 		return false;
 	}
     if (newPassword != confirmNewPassword) {