Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js =================================================================== diff -u -r16427 -r16858 --- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js (.../borrowingTousseForm.js) (revision 16427) +++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js (.../borrowingTousseForm.js) (revision 16858) @@ -58,6 +58,8 @@ listeners:{ beforeload : function(store){ store.baseParams["cssdOrgUnitCode"] = top.Ext.getCmp('handleDepartCoding').getValue(); + //申请科室编号 + store.baseParams["appCode"] = top.Ext.getCmp('departCoding').getValue(); } } }); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java =================================================================== diff -u -r16856 -r16858 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 16856) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 16858) @@ -1565,9 +1565,12 @@ List> mapList = tousseDefinitionManager.searchTousseForBorrowing(spell); String borrowIsUseBwList = CssdUtils.getSystemSetConfigByName("borrowIsUseBwList"); if (StringUtils.isNotBlank(borrowIsUseBwList) && "true".equals(borrowIsUseBwList)){ - logger.debug("黑白名单过滤前大小:" + mapList.size()); - // mapList = goodFilterConfigManagerImpl.handleBWList(mapList); - logger.debug("黑白名单过滤后大小:" + mapList.size()); + String appCode = StrutsParamUtils.getPraramValue("appCode", ""); + if (StringUtils.isNotBlank(appCode)){ + logger.debug("黑白名单过滤前大小:" + mapList.size()); + mapList = goodFilterConfigManagerImpl.handleBWList(mapList, appCode); + logger.debug("黑白名单过滤后大小:" + mapList.size()); + } } PageUtil.outPutResult(PageUtil.getPagePara(), mapList); } catch (IOException e) {