Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java
===================================================================
diff -u -r12706 -r12711
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java	(.../WareHouseManager.java)	(revision 12706)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java	(.../WareHouseManager.java)	(revision 12711)
@@ -32,6 +32,8 @@
 	 */
 	public List<WareHouse> getWareHouseListByOrgUnit(OrgUnit orgUnit);
 	
+	public List<WareHouse> getWareHouseListByCurrentOrgUnit();
+	
 	/**
 	 * 新增或修改仓库
 	 * @param wareHouse
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
===================================================================
diff -u -r12706 -r12711
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java	(.../WareHouseManagerImpl.java)	(revision 12706)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java	(.../WareHouseManagerImpl.java)	(revision 12711)
@@ -1,5 +1,6 @@
 package com.forgon.disinfectsystem.basedatamanager.warehouse.service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -8,6 +9,7 @@
 
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.model.OrgUnit;
+import com.forgon.directory.service.OrgUnitManager;
 import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.tools.hibernate.ObjectDao;
@@ -20,11 +22,15 @@
 public class WareHouseManagerImpl implements WareHouseManager {
 	
 	private ObjectDao objectDao;
-
+	private OrgUnitManager orgUnitManager;
 	public void setObjectDao(ObjectDao objectDao) {
 		this.objectDao = objectDao;
 	}
 
+	public void setOrgUnitManager(OrgUnitManager orgUnitManager) {
+		this.orgUnitManager = orgUnitManager;
+	}
+
 	/**
 	 * 查询所有的仓库
 	 * @return
@@ -71,6 +77,18 @@
 		return objectDao.findBySql(WareHouse.class.getSimpleName(), sql);
 	}
 	
+	public List<WareHouse> getWareHouseListByCurrentOrgUnit(){
+		LoginUserData loginUserData = AcegiHelper.getLoginUser();
+		List<WareHouse> list = new ArrayList<WareHouse>();
+		if(loginUserData != null){
+			OrgUnit orgUnit = orgUnitManager.getByCode(loginUserData.getCurrentOrgUnitCode());
+			list = getWareHouseListByOrgUnit(orgUnit);
+		}
+		if(list == null){
+			list = new ArrayList<WareHouse>();
+		}
+		return list;
+	}
 	/**
 	 * 新增或修改仓库
 	 * @param wareHouse