Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r29535 -r29551
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 29535)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 29551)
@@ -222,6 +222,29 @@
     return (myNav.indexOf('msie') != -1) ? parseInt(myNav.split('msie')[1]) : false;
 }
 
+function isIE2(value){
+    var vals = value || '';
+	if(!!window.ActiveXObject || "ActiveXObject" in window){
+		if(vals !== ''){
+			var DEFAULT_VERSION = 8.0;  
+			var ua = navigator.userAgent.toLowerCase();
+			var safariVersion = ua.match(/msie ([\d.]+)/) || ''; 
+			if(safariVersion == ''){
+				return false;
+			}
+			if(safariVersion[1] <= DEFAULT_VERSION ){  
+				return true;
+			}else {
+				return false;
+			}
+		}
+
+		return true;
+	}else{
+		return false;
+　　 }
+}
+
 function logout(contextPath) {
     var springSecurityLogoutUrl = contextPath + "/j_spring_security_logout";
     top.document.location.href = springSecurityLogoutUrl;
@@ -2548,85 +2571,112 @@
     }
     return false;
 }
-
-function openSelectUser() {
-    var userIdsElement;
-    if (Ext.getCmp("userIds")) {
-        userIdsElement = Ext.getCmp("userIds");
-    } else if (top.Ext.getCmp("userIds")) {
-        userIdsElement = top.Ext.getCmp("userIds");
-    }
-    var userNamesElement;
-    if (Ext.getCmp("userNames")) {
-        userNamesElement = Ext.getCmp("userNames");
-    } else if (top.Ext.getCmp("userNames")) {
-        userNamesElement = top.Ext.getCmp("userNames");
-    }
+function openSelectUser(params) {
+    var userIdsElement = params.userIdsElement;
+    var userNamesElement = params.userNamesElement;
+    var root = params.root || WWWROOT;
+    var isDom = params.isDom;
     var arg = {};
-    arg.userIds = userIdsElement.getValue();
-    arg.userNames = userNamesElement.getValue();
-
-    arg.userIdsArray = arg.userIds.split(";");
+    arg.userIds = isDom?userIdsElement.value:userIdsElement.getValue();
+    arg.userNames = isDom?userNamesElement.value:userNamesElement.getValue();
+    var ids = [];
+    if(arg.userIds.split(";").length > 0){
+        for(var i=0;i<arg.userIds.split(";").length;i++){
+            var item = arg.userIds.split(";")[i];
+            if(item !== ''){
+                if(item.indexOf('USERID_') == -1){
+                    ids.push('USERID_'+item);
+                }else {
+                    ids.push(item);
+                }
+            }
+        }
+    }
+    arg.userIdsArray = ids;
     arg.userNamesArray = arg.userNames.split(";");
-    arg.action = 'includeUsers';
+    arg.action = params.action || 'includeUsers';
     //GGSRMYY-129修改了参数的提交方式
     sessionStorage.setItem('arg',JSON.stringify(arg));
-    var selectedUsersArray = openModalWindow(WWWROOT + '/common/selPersonByOrgUnitByExt.jsp', {}, '700', '430');
-    var userIds = '';
-    var userNames = '';
-
+    var selectedUsersArray = openModalWindow(root + '/common/selPersonByOrgUnitByExt.jsp', {}, '700', '430');
+    var userIds = [];
+    var userNames = [];
     if (selectedUsersArray == undefined) {
         return;
+    }else if(isIE2() && selectedUsersArray[0] == undefined){
+        if(isDom){
+            userIdsElement.value = '';
+            userNamesElement.value = '';
+        }else {
+            if(params.action !== 'principal'){
+                userIdsElement.setValue('');
+            }
+            userNamesElement.setValue('');
+        }
     } else if (selectedUsersArray[0] !== undefined) {
-        if (selectedUsersArray.length > 0) {
+        if (selectedUsersArray && selectedUsersArray.length > 0) {
             for (var i = 0; i < selectedUsersArray.length; i++) {
                 var userStr = selectedUsersArray[i];
-                if (userIds == '') {
-                    userIds = userStr.split('#*')[0];
-                } else {
-                    userIds += ';' + userStr.split('#*')[0];
+                var name = userStr.split(';')[1];
+                var fullName = userStr.split(';')[2];
+                if(params.action == 'principal'){
+                    userNames.push(fullName);
+                }else if(params.action == 'leader'){
+                    userIds.push("USERID_" + name);
+                    userNames.push(fullName);
+                }else {
+                    userIds.push("USERID_" + name);
+                    userNames.push(fullName);
                 }
-
-                if (userNames == '') {
-                    userNames = userStr.split('#*')[1];
-                } else {
-                    userNames += ';' + userStr.split('#*')[1];
+            }
+            if(isDom){
+                userIdsElement.value = userIds.join(';');
+			    userNamesElement.value = userNames.join(';');
+            }else {
+                if(params.action !== 'principal'){
+                    userIdsElement.setValue(userIds.join(';'));
                 }
+                userNamesElement.setValue(userNames.join(';'));
             }
-
-            userIdsElement.setValue(userIds);
-            userNamesElement.setValue(userNames);
-        }else {
-            userIdsElement.setValue('');
-            userNamesElement.setValue('');
         }
     } else {
         var loop = setInterval(function() {
             if (selectedUsersArray.closed) {
                 clearInterval(loop);
-                var returnValue = selectedUsersArray.returnValue || [];
-
-                if (returnValue.length > 0) {
+                var returnValue = selectedUsersArray.returnValue;
+                if (returnValue && returnValue.length > 0) {
                     for (var i = 0; i < returnValue.length; i++) {
                         var userStr = returnValue[i];
-                        if (userIds == '') {
-                            userIds = userStr.split('#*')[0];
-                        } else {
-                            userIds += ';' + userStr.split('#*')[0];
+                        var name = userStr.split(';')[1];
+                        var fullName = userStr.split(';')[2];
+                        if(params.action == 'principal'){
+                            userNames.push(fullName);
+                        }else if(params.action == 'leader'){
+                            userIds.push("USERID_" + name);
+                            userNames.push(fullName);
+                        }else {
+                            userIds.push("USERID_" + name);
+                            userNames.push(fullName);
                         }
-
-                        if (userNames == '') {
-                            userNames = userStr.split('#*')[1];
-                        } else {
-                            userNames += ';' + userStr.split('#*')[1];
+                    }
+                    if(isDom){
+                        userIdsElement.value = userIds.join(';');
+                        userNamesElement.value = userNames.join(';');
+                    }else {
+                        if(params.action !== 'principal'){
+                            userIdsElement.setValue(userIds.join(';'));
                         }
+                        userNamesElement.setValue(userNames.join(';'));
                     }
-
-                    userIdsElement.setValue(userIds);
-                    userNamesElement.setValue(userNames);
-                }else {
-                    userIdsElement.setValue('');
-                    userNamesElement.setValue('');
+                }else if(returnValue && returnValue.length == 0){
+                    if(isDom){
+                        userIdsElement.value = '';
+                        userNamesElement.value = '';
+                    }else {
+                        if(params.action !== 'principal'){
+                            userIdsElement.setValue('');
+                        }
+                        userNamesElement.setValue('');
+                    }
                 }
             }
         }, 500);