Index: ssts-web/src/main/webapp/common/selPersonByOrgUnitByExt.js =================================================================== diff -u -r27246 -r29535 --- ssts-web/src/main/webapp/common/selPersonByOrgUnitByExt.js (.../selPersonByOrgUnitByExt.js) (revision 27246) +++ ssts-web/src/main/webapp/common/selPersonByOrgUnitByExt.js (.../selPersonByOrgUnitByExt.js) (revision 29535) @@ -20,20 +20,22 @@ } return(false); } - +var saveCache = {}; if(search !== ''){ userIds = getQueryVariable('userIds'); userNames =getQueryVariable('userNames'); userIdsArray = getQueryVariable('userIdsArray').split(','); userNamesArray =getQueryVariable('userNamesArray').split(','); action = getQueryVariable('action'); }else { - var arg = dialogArguments || ''; - userIds = arg.userIds; - userNames = arg.userNames; - userIdsArray = arg.userIdsArray; - userNamesArray = arg.userNamesArray; - action = arg.action; + if(sessionStorage.getItem('arg')){ + var arg = JSON.parse(sessionStorage.getItem('arg')); + userIds = arg.userIds; + userNames = arg.userNames; + userIdsArray = arg.userIdsArray; + userNamesArray = arg.userNamesArray; + action = arg.action; + } } // var action = 'leader'; @@ -52,7 +54,6 @@ //用于缓存左边store查询的条件 var leftSearchCache = {}; //缓存右边store的数据 -var saveCache = {}; //用于缓存右边store查询的条件 var rightSearchCache = {}; //部门搜索的缓存 @@ -128,7 +129,11 @@ delete saveCache[id]; }); setRightSearchCondition(saveCache); - userStore2.load({params: {start: userStore2.lastOptions.params.start, limit: pageSize}}); + if(Object.keys(saveCache).length == 0){ + userStore2.removeAll(); + }else { + userStore2.load({params: {start: userStore2.lastOptions.params.start, limit: pageSize}}); + } } /** @@ -140,7 +145,7 @@ rightSearchCache['userIds'] = null; rightSearchCache['userNamesArrays'] = null; userStore2.removeAll(); - userStore2.load({params: {start: 0, limit: pageSize}}); + //userStore2.load({params: {start: 0, limit: pageSize}}); } /**