Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r29166 -r29168
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 29166)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 29168)
@@ -2145,17 +2145,18 @@
     	var passwordNotContainLoginName = pwdConfig.passwordNotContainLoginName;
     	
     	minPwdLength = isUndefinedOrNullOrEmpty(minPwdLength) ? 6 : minPwdLength;
-    	if (!isUndefinedOrNullOrEmpty(pwdConfig.minPwdLength)){
-    		minPwdLength = pwdConfig.minPwdLength;
-    	}
     	
     	if(pwd.length < minPwdLength){
     		obj.msg = "密码长度最小为" + minPwdLength + "位!";
-    	}else if((containNumber && !/[0-9]+/.test(pwd)) || (containLetter && !/[a-zA-Z]+/.test(pwd))){
-    		obj.msg = "密码必须包含字母和数字!";
-    	}else if((containUppercaseLetter && !/[A-Z]+/.test(pwd)) || (containLowerCaseLetter && !/[a-z]+/.test(pwd))){
-    		obj.msg = "密码必须包含大写字母和小写字母!";
-    	}else if((containSpecialChar && !/[^A-Za-z0-9]/.test(pwd))){
+    	}else if(containNumber && !/[0-9]+/.test(pwd)){
+    		obj.msg = "密码必须包含数字!";
+    	}else if(containLetter && !/[a-zA-Z]+/.test(pwd)){
+    		obj.msg = "密码必须包含字母!";
+    	}else if(containUppercaseLetter && !/[A-Z]+/.test(pwd)){
+    		obj.msg = "密码必须包含大写字母!";
+    	}else if(containLowerCaseLetter && !/[a-z]+/.test(pwd)){
+    		obj.msg = "密码必须包含小写字母!";
+    	}else if(containSpecialChar && !/[^A-Za-z0-9]/.test(pwd)){
     		obj.msg = "密码必须包含特殊字符!";
     	}else if(!isUndefinedOrNullOrEmpty(loginUser)){
     		var tempPwd = pwd.toLowerCase();