Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r29452 -r29459
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 29452)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 29459)
@@ -2149,57 +2149,48 @@
         var windowsPasswordComplexityReq = pwdConfig.windowsPasswordComplexityReq;
     	
         minPwdLength = isUndefinedOrNullOrEmpty(minPwdLength) ? 6 : minPwdLength;
-        
-        if(windowsPasswordComplexityReq){
-            //包含数字，大写，小写
-            var regExp1 = new RegExp('(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])');
-            //包含数字，特殊符号，大写
-            var regExp2 = new RegExp('(?=.*[0-9])(?=.*[^a-zA-Z0-9])(?=.*[A-Z])');
-            //包含数字，特殊符号，小写
-            var regExp3 = new RegExp('(?=.*[0-9])(?=.*[^a-zA-Z0-9])(?=.*[a-z])');
-            //包含特殊符号，大写，小写
-            var regExp4 = new RegExp('(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])');
-            if(!regExp1.test(pwd) && !regExp2.test(pwd) && !regExp3.test(pwd) && !regExp4.test(pwd)){
-                obj.msg = "密码强度不够，至少包含大写字母，小写字母、数字、特殊字符的其中三种";
-            }else {
-                obj.success = true;
-            }
-        }else if(passwordComplexityReq1){
-            //包含数字，英文字母
-            var regExp1 = new RegExp('(?=.*[0-9])(?=.*[a-zA-Z])');
-            //包含数字，特殊符号
-            var regExp2 = new RegExp('(?=.*[0-9])(?=.*[^a-zA-Z0-9])');
-            //包含特殊符号，英文字母
-            var regExp3 = new RegExp('(?=.*[^a-zA-Z0-9])(?=.*[a-zA-Z])');
-            if(!regExp1.test(pwd) && !regExp2.test(pwd) && !regExp3.test(pwd)){
-                obj.msg = "密码强度不够，至少包含英文字母、数字、特殊字符的其中两种!";
-            }else {
-                obj.success = true;
-            }
-        }else {
-            if(pwd.length < minPwdLength){
-                obj.msg = "密码长度最小为" + minPwdLength + "位!";
-            }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();
-                var tempLoginUser = loginUser.toLowerCase();
-                if(passwordNotContainLoginName && tempPwd.indexOf(tempLoginUser) == 0){
-                    obj.msg = "密码不可以包含账号!";
-                }else{
-                    obj.success = true;
-                }
+
+        //包含数字，大写，小写
+        var regExp1 = new RegExp('(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])');
+        //包含数字，特殊符号，大写
+        var regExp2 = new RegExp('(?=.*[0-9])(?=.*[^a-zA-Z0-9])(?=.*[A-Z])');
+        //包含数字，特殊符号，小写
+        var regExp3 = new RegExp('(?=.*[0-9])(?=.*[^a-zA-Z0-9])(?=.*[a-z])');
+        //包含特殊符号，大写，小写
+        var regExp4 = new RegExp('(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])');
+        //包含数字，英文字母
+        var regExp5 = new RegExp('(?=.*[0-9])(?=.*[a-zA-Z])');
+        //包含数字，特殊符号
+        var regExp6 = new RegExp('(?=.*[0-9])(?=.*[^a-zA-Z0-9])');
+        //包含特殊符号，英文字母
+        var regExp7 = new RegExp('(?=.*[^a-zA-Z0-9])(?=.*[a-zA-Z])');
+
+        if(pwd.length < minPwdLength){
+            obj.msg = "密码长度最小为" + minPwdLength + "位!";
+        }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();
+            var tempLoginUser = loginUser.toLowerCase();
+            if(passwordNotContainLoginName && tempPwd.indexOf(tempLoginUser) == 0){
+                obj.msg = "密码不可以包含账号!";
             }else{
                 obj.success = true;
             }
+        }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)){
+            obj.msg = "密码强度不够，至少包含英文字母、数字、特殊字符的其中两种!";
+        }else{
+            obj.success = true;
         }
     } else {
     	obj.success = true;
@@ -2583,8 +2574,8 @@
     arg.userIdsArray = arg.userIds.split(";");
     arg.userNamesArray = arg.userNames.split(";");
     arg.action = 'includeUsers';
-    var selectedUsersArray = openModalWindow(WWWROOT + '/common/selPersonByOrgUnitByExt.jsp', arg, '700', '430');
-
+    sessionStorage.setItem('arg',JSON.stringify(arg));
+    var selectedUsersArray = openModalWindow(WWWROOT + '/common/selPersonByOrgUnitByExt.jsp', {}, '700', '430');
     var userIds = '';
     var userNames = '';
 
@@ -2609,6 +2600,9 @@
 
             userIdsElement.setValue(userIds);
             userNamesElement.setValue(userNames);
+        }else {
+            userIdsElement.setValue('');
+            userNamesElement.setValue('');
         }
     } else {
         var loop = setInterval(function() {
@@ -2634,6 +2628,9 @@
 
                     userIdsElement.setValue(userIds);
                     userNamesElement.setValue(userNames);
+                }else {
+                    userIdsElement.setValue('');
+                    userNamesElement.setValue('');
                 }
             }
         }, 500);