Index: ssts-web/src/main/webapp/common/orgUnitHelper.js
===================================================================
diff -u -r22468 -r29551
--- ssts-web/src/main/webapp/common/orgUnitHelper.js	(.../orgUnitHelper.js)	(revision 22468)
+++ ssts-web/src/main/webapp/common/orgUnitHelper.js	(.../orgUnitHelper.js)	(revision 29551)
@@ -46,17 +46,6 @@
                 totalProperty: 'totalCount',
                 listeners: {
                     beforeload: function (store, options) {
-                        //读取上次所选的请求参数
-                        /*  var lastOptions = store.lastOptions;
-                         if (lastOptions){
-                         var orgUnitCode = lastOptions.params.orgUnitCode;
-                         var fullName = lastOptions.params.fullName;
-                         //如果上次的orgUnitCode存在且这次的orgUnitCode为空,则设置orgUnitCode(这种情况是用户进行了翻页)
-                         if (!Ext.isEmpty(orgUnitCode) && Ext.isEmpty(options.params.orgUnitCode)){
-                         options.params['orgUnitCode'] = orgUnitCode;
-                         }
-
-                         }*/
                     }
                 }
             }
@@ -72,26 +61,12 @@
      */
     userObj.setReturnResult = function (saveCache, action) {
         var returnArr = [];
-        if ('principal' == action) {
-            for (var pro in saveCache) {
-                var fullName = saveCache[pro]['fullName'];
-                returnArr.push(fullName);
-            }
+        for (var pro in saveCache) {
+            var fullName = saveCache[pro]['fullName'];
+            var id = saveCache[pro]['id'];
+            var name = saveCache[pro]['name'];
+            returnArr.push(id+';'+name+';'+fullName);
         }
-        else if ('leader' == action) {
-            for (var pro in saveCache) {
-                var fullName = saveCache[pro]['fullName'];
-                var id = saveCache[pro]['id'];
-                returnArr.push(id + "#*" + fullName);
-            }
-        }
-        else if ('includeUsers' == action) {
-            for (var pro in saveCache) {
-                var name = saveCache[pro]['name'];
-                var fullName = saveCache[pro]['fullName'];
-                returnArr.push("USERID_" + name + "#*" + fullName);
-            }
-        }
         return returnArr;
     }
 
@@ -162,48 +137,43 @@
         var userNamesArrays = para.userNamesArrays;
         var userIdsArray = para.userIdsArray;
         var pageSize = para.pageSize;
+        var params = {};
         //如果是组织人,用名字来查找
         if ('principal' == action) {
-            userStore.load({
-                params: {start: 0, limit: pageSize, userNamesArrays: userNamesArrays},
-                callback: function (records, option) {
-                	userCacheStore.load({
-                        params: {start: 0, limit: pageSize, userNamesArrays: userNamesArrays},
-                        callback: function (userCacheRecords, userCacheOption) {
-                            me.setSaveCache(userCacheRecords, userCacheOption, saveCache);
-                        }
-                    });
-                }
-            });
+            params = {
+                start: 0, 
+                limit: pageSize, 
+                userNamesArrays: userNamesArrays
+            }
         }
         //如果是包含用户,用页面传进来的userIdsArray就是相当于User表中的name,所以用name来查找
         else if ('includeUsers' == action) {
-            userStore.load({
-                params: {start: 0, limit: pageSize, names: me.getIds(userIdsArray)},
-                callback: function (records, option) {
-                	userCacheStore.load({
-                        params: {start: 0, limit: pageSize, names:  me.getIds(userIdsArray)},
-                        callback: function (userCacheRecords, userCacheOption) {
-                            me.setSaveCache(userCacheRecords, userCacheOption, saveCache);
-                        }
-                    });
-                }
-            });
+            params = {
+                start: 0, 
+                limit: pageSize, 
+                names: me.getIds(userIdsArray)
+            }
         }
         //如果是分属领导,则用id来查找
         else if ('leader' == action) {
-            userStore.load({
-                params: {start: 0, limit: pageSize, userIds: userIdsArray},
-                callback: function (records, option) {
-                	userCacheStore.load({
-                        params: {start: 0, limit: pageSize,  userIds: userIdsArray},
-                        callback: function (userCacheRecords, userCacheOption) {
-                            me.setSaveCache(userCacheRecords, userCacheOption, saveCache);
-                        }
-                    });
-                }
-            });
+            params = {
+                start: 0, 
+                limit: pageSize, 
+                userNamesArrays: userNamesArrays
+            }
         }
+
+        userStore.load({
+            params: params,
+            callback: function (records, option) {
+                userCacheStore.load({
+                    params:params,
+                    callback: function (userCacheRecords, userCacheOption) {
+                        me.setSaveCache(userCacheRecords, userCacheOption, saveCache);
+                    }
+                });
+            }
+        });
     }
 
     /**