机械器材领用判断orgid

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceGetController.java

@@ -215,8 +215,8 @@ public class StorageDeviceGetController {
 	@ApiImplicitParams({
 		 @ApiImplicitParam(name = "depotTypeId", value = "depotTypeId", paramType = "query"),
 	})
-    public List<ShelfContentBean> getNameList(Integer depotTypeId){
-    	List<ShelfContentBean> getNameList=deviceInputService.getNameList(depotTypeId);
+    public List<ShelfContentBean> getNameList(Integer depotTypeId,Integer orgId){
+    	List<ShelfContentBean> getNameList=deviceInputService.getNameList(depotTypeId,orgId);
     	return getNameList;
     }
    

src/main/java/com/chinaitop/depot/device/mapper/StorageDeviceinputMapper.java

@@ -42,7 +42,7 @@ public interface StorageDeviceinputMapper {
    	
    	List<ShelfContentBean> getShelfList(Integer depotTypeId);
 
-   	List<ShelfContentBean> getNameList(Integer depotTypeId);
+   	List<ShelfContentBean> getNameList(Integer depotTypeId,Integer orgId);
 
    	ContentBean getcontentGetList(Map<String, Object> map);
 

src/main/java/com/chinaitop/depot/device/mapper/StorageDeviceinputMapper.xml

@@ -513,7 +513,7 @@
 
   <select id="getNameList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.device.model.ShelfContentBean">
 
-    select DISTINCT (be.enumName),sd.device_name from storage_deviceinput sd left join basic_enum be on be.enumId=sd.device_name  where device_type=#{deviceTypeId} and `status`!=1 and use_count!=0;
+    select DISTINCT (be.enumName),sd.device_name from storage_deviceinput sd left join basic_enum be on be.enumId=sd.device_name  where sd.org_id=#{orgId} and sd.device_type=#{depotTypeId} and `status`!=1 and use_count!=0;
 
    </select>
 

src/main/java/com/chinaitop/depot/device/service/StorageDeviceInputService.java

@@ -27,7 +27,7 @@ public interface StorageDeviceInputService {
 
 	List<HouseTypeBean> getTypeList(Integer depotId);
 
-	List<ShelfContentBean> getNameList(Integer depotTypeId);
+	List<ShelfContentBean> getNameList(Integer depotTypeId,Integer orgId);
 
 	ContentBean getcontentGetList(String deviceName);
 

src/main/java/com/chinaitop/depot/device/service/impl/StorageDeviceInputServiceImpl.java

@@ -81,9 +81,9 @@ public class StorageDeviceInputServiceImpl implements StorageDeviceInputService{
 	
 	//根据类型获取名称
 	@Override
-	public List<ShelfContentBean> getNameList(Integer depotTypeId) {
+	public List<ShelfContentBean> getNameList(Integer depotTypeId,Integer orgId) {
 		// TODO Auto-generated method stub
-		return deviceInputMapper.getNameList(depotTypeId);
+		return deviceInputMapper.getNameList(depotTypeId,orgId);
 	}
 	
 	@Override