Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/dwr/table/MaterialEntryTableManager.java =================================================================== diff -u -r12331 -r13116 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/dwr/table/MaterialEntryTableManager.java (.../MaterialEntryTableManager.java) (revision 12331) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/dwr/table/MaterialEntryTableManager.java (.../MaterialEntryTableManager.java) (revision 13116) @@ -2,22 +2,33 @@ import java.util.List; import java.util.Map; +import java.util.Set; import com.forgon.component.grid.GridManager; +import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager; import com.forgon.disinfectsystem.entity.materialmanager.MaterialEntry; +import com.forgon.tools.util.SqlUtils; public class MaterialEntryTableManager { private GridManager gridManager; + + private WareHouseManager wareHouseManager; public void setGridManager(GridManager gridManager) { this.gridManager = gridManager; } + public void setWareHouseManager(WareHouseManager wareHouseManager) { + this.wareHouseManager = wareHouseManager; + } + public String findMaterialEntryTableList( Map> parameterMap) { String sql = "where po.type='" + MaterialEntry.TYPE_IN + "'"; + Set currentUserWarehouseIds = wareHouseManager.getCurrentUserOrgUnitWarehouseIds(); + sql += " and " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.wareHouseId", currentUserWarehouseIds); return gridManager.renderGrid(parameterMap, MaterialEntry.class.getSimpleName(), sql, new String[] { "itemsList" }); @@ -27,6 +38,8 @@ Map> parameterMap) { String sql = "where po.type='" + MaterialEntry.TYPE_OUT + "'"; + Set currentUserWarehouseIds = wareHouseManager.getCurrentUserOrgUnitWarehouseIds(); + sql += " and " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.wareHouseId", currentUserWarehouseIds); return gridManager.renderGrid(parameterMap, MaterialEntry.class.getSimpleName(), sql, new String[] {}); }