Index: ssts-web/src/main/webapp/systemmanage/userFormExt.js
===================================================================
diff -u -r25166 -r27308
--- ssts-web/src/main/webapp/systemmanage/userFormExt.js	(.../userFormExt.js)	(revision 25166)
+++ ssts-web/src/main/webapp/systemmanage/userFormExt.js	(.../userFormExt.js)	(revision 27308)
@@ -1,7 +1,6 @@
 var	isRepeatLogninId = true;
 var hidePWD = false;
 function openSelectOrgUnit(root){
-	
 	var orgIds = $Id(root + 'Ids').value;
 	var orgNames = $Id(root + 'Names').value;
 	var varArgIn = {
@@ -10,18 +9,44 @@
 			orgNames: orgNames
 	}
 	var selectedOrgUnitArray = openModalWindow(WWWROOT + '/common/selOrgUnitByExt.jsp?allowNull=true&onlyOneOrg=true', varArgIn, '800', '274');
-	if(selectedOrgUnitArray != null){
-		Ext.getCmp(root + 'Ids').setValue(selectedOrgUnitArray[0]) ;
-		Ext.getCmp(root + 'Names').setValue(selectedOrgUnitArray[1]) ;
-	}
+	
+    if(selectedOrgUnitArray == undefined){
+        return;
+    }else {
+        var loop = setInterval(function() {
+            if(selectedOrgUnitArray.closed) {
+                clearInterval(loop);
+
+                var returnValue = selectedOrgUnitArray.returnValue || [];
+
+                if(returnValue.length > 0){
+                    Ext.getCmp(root + 'Ids').setValue(returnValue[0]) ;
+                    Ext.getCmp(root + 'Names').setValue(returnValue[1]) ;
+                }
+            }
+        },500);
+    }
 }
 function openSelectRole(){
 	var roleIds = Ext.getCmp('roleIds').getValue();
 	var selectedRole = openModalWindow(WWWROOT+'/common/selRoleByExt.jsp?roleIds='+roleIds, '选择角色', '550', '274');
-	if(selectedRole != null){
-		Ext.getCmp('roleIds').setValue(selectedRole[0]) ;
-		Ext.getCmp('roleNames').setValue(selectedRole[1]) ;
-	}
+	
+    if(selectedRole == undefined){
+        return;
+    }else {
+        var loop = setInterval(function() {
+            if(selectedRole.closed) {
+                clearInterval(loop);
+
+                var returnValue = selectedRole.returnValue || [];
+
+                if(returnValue.length > 0){
+                    Ext.getCmp('roleIds').setValue(returnValue[0]) ;
+                    Ext.getCmp('roleNames').setValue(returnValue[1]) ;
+                }
+            }
+        },500);
+    }
 }
 
 function validateUser(id){