Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r29463 -r29466
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 29463)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 29466)
@@ -2134,7 +2134,6 @@
     var obj = {"success":false, "msg":msg};
 	
     if ( !isUndefinedOrNullOrEmpty(pwdConfig)) {
-    	
     	var minPwdLength = pwdConfig.minPwdLength;
     	var containLetter = pwdConfig.containLetter;
     	var containUppercaseLetter = pwdConfig.containUppercaseLetter;
@@ -2164,6 +2163,9 @@
         //包含特殊符号，英文字母
         var regExp7 = new RegExp('(?=.*[^a-zA-Z0-9])(?=.*[a-zA-Z])');
 
+        var tempPwd = pwd.toLowerCase();
+        var tempLoginUser = loginUser.toLowerCase();
+
         if(pwd.length < minPwdLength){
             obj.msg = "密码长度最小为" + minPwdLength + "位!";
         }else if(containNumber && !/[0-9]+/.test(pwd)){
@@ -2176,14 +2178,8 @@
             obj.msg = "密码必须包含小写字母!";
         }else if(containSpecialChar && !/[^A-Za-z0-9]/.test(pwd)){
             obj.msg = "密码必须包含特殊字符!";
-        }else if(!isUndefinedOrNullOrEmpty(loginUser)){
-            var tempPwd = pwd.toLowerCase();
-            var tempLoginUser = loginUser.toLowerCase();
-            if(passwordNotContainLoginName && tempPwd.indexOf(tempLoginUser) >= 0){
-                obj.msg = "密码不可以包含账号!";
-            }else{
-                obj.success = true;
-            }
+        }else if(passwordNotContainLoginName && tempPwd.indexOf(tempLoginUser) >= 0){
+            obj.msg = "密码不可以包含账号!";
         }else if(windowsPasswordComplexityReq && !regExp1.test(pwd) && !regExp2.test(pwd) && !regExp3.test(pwd) && !regExp4.test(pwd)){
             obj.msg = "密码强度不够，至少包含大写字母，小写字母、数字、特殊字符的其中三种";
         }else if(passwordComplexityReq1 && !regExp5.test(pwd) && !regExp6.test(pwd) && !regExp7.test(pwd)){