Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java =================================================================== diff -u -r12331 -r12941 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java (.../TousseDefinitionTableManager.java) (revision 12331) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java (.../TousseDefinitionTableManager.java) (revision 12941) @@ -79,11 +79,12 @@ + TousseDefinition.PACKAGE_TYPE_CUSTOM + "' and po.tousseType != '" + TousseDefinition.PACKAGE_TYPE_FOREIGN + "'"; - if (currentOrgUnitCode == null + //现在器械包定义的handlerDepartCode这个字段已经不用了,所以去掉条件过滤,防止二级供应室用户看不到该字段值不为该用户所在科室的器械包 + /*if (currentOrgUnitCode == null || (currentOrgUnitCode != null && currentOrgUnitCode.equals(departCode))) {// 当前登录用户是一级供应室的人,可查全部 } else {// 二级供应室 sql += " and po.handlerDepartCode='" + currentOrgUnitCode + "' "; - } + }*/ sql += " and (po.forDisplay = 1 or po.forDisplay is null)"; return gridManager.renderGrid(parameterMap,