Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java =================================================================== diff -u -r12917 -r12921 --- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java (.../ReturnGoodsRecordTableManager.java) (revision 12917) +++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java (.../ReturnGoodsRecordTableManager.java) (revision 12921) @@ -104,11 +104,11 @@ sql += " and po.returnTime <= " + dateQueryAdapter.dateAdapter(endDate); } - if (StringUtils.equals(searchAll, "false")) { + /*if (StringUtils.equals(searchAll, "false")) { sql += " and po.departCoding = '" + AcegiHelper.getLoginUser() .getCurrentOrgUnitCode() + "'"; - } + }*/ sql += " and po.handleDepartCode = '" + AcegiHelper.getLoginUser() .getCurrentOrgUnitCode() + "'"; return gridManager.renderGrid(parameterMap,