Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r29459 -r29463 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 29459) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 29463) @@ -2130,9 +2130,8 @@ /*simon:update needBeStrongPwdWhenModifyPwd当修改密码时,密码是否一定为强密码*/ //needBeStrongPwdWhenModifyPwd :{'minPwdLength':8,'containLetter':true,'containUppercaseLetter':false,'containLowerCaseLetter':false,'containSpecialChar':true,'containNumber':true,'passwordNotContainLoginName':true} var pwdConfig = sstsConfig.needBeStrongPwdWhenModifyPwd; - var msg = "密码必须包含字母和数字,长度最小为8位!"; - var obj = {"success":false, "msg":msg}; + var obj = {"success":false, "msg":msg}; if ( !isUndefinedOrNullOrEmpty(pwdConfig)) { @@ -2180,7 +2179,7 @@ }else if(!isUndefinedOrNullOrEmpty(loginUser)){ var tempPwd = pwd.toLowerCase(); var tempLoginUser = loginUser.toLowerCase(); - if(passwordNotContainLoginName && tempPwd.indexOf(tempLoginUser) == 0){ + if(passwordNotContainLoginName && tempPwd.indexOf(tempLoginUser) >= 0){ obj.msg = "密码不可以包含账号!"; }else{ obj.success = true;