Index: ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/dwr/table/StockTakeRecordTableManager.java
===================================================================
diff -u -r13147 -r13389
--- ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/dwr/table/StockTakeRecordTableManager.java	(.../StockTakeRecordTableManager.java)	(revision 13147)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/dwr/table/StockTakeRecordTableManager.java	(.../StockTakeRecordTableManager.java)	(revision 13389)
@@ -5,13 +5,17 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+
 import org.apache.commons.lang.StringUtils;
+
 import com.forgon.component.grid.GridManager;
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.stocktakerecordmanager.StockTakeRecord;
 import com.forgon.disinfectsystem.stocktakerecordmanager.service.StockTakeRecordManager;
+import com.forgon.tools.util.SqlUtils;
 
 /**
  * @author wangyi
@@ -41,9 +45,8 @@
 
 	public String findStockTakeRecordList(
 			Map<String, List<String>> parameterListMap) {
-		String orgUnitCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
-		WareHouse warehouse = wareHouseManager.getDefaultWareHouseByUnitCode(orgUnitCode);
-		String sql = "where po.warehouseId = " + warehouse.getId();
+		Set<Long> warehouseIds = wareHouseManager.getCurrentUserOrgUnitWarehouseIds();
+		String sql = String.format("where %s "  , SqlUtils.getNonStringFieldInCollectionsPredicate("po.warehouseId", warehouseIds));
 		return gridManager.renderGrid(parameterListMap,
 				StockTakeRecord.class.getSimpleName(), sql,
 				new String[] { "diposableGoods" });