前台获取粮库名称

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

@@ -57,8 +57,6 @@ public class StorageDeviceGetController {
 	@Resource
 	private BasicEquipmentEquipmentPoolService equipmentPoolService;
 	
-	/*@Resource
-	private OrgInfoService orgInfoService;*/
 	
 	 /**
      * 分页获取器材信息
@@ -88,17 +86,6 @@ public class StorageDeviceGetController {
    
         PageHelper.startPage(pageNum, pageSize);
         List<StorageDeviceget> list = deviceGetService.queryByDevice(storageDevicegetExample);
-       if(list!=null && list.size()>0){
-    	   for (StorageDeviceget storageDeviceget : list) {
-    		   
-    		   /*UserInfo userInfo =(UserInfo) request.getSession().getAttribute("userInfo");
-        	if(userInfo.getOrgId()!=null){
-        		OrgInfo orgInfo = orgInfoService.findById(userInfo.getOrgId());
-        		storageDeviceget.setOrgName(orgInfo.getOrgName());
-        	}*/
-    		   storageDeviceget.setOrgName(orgName);
-    	   }
-       }
         PageInfo<StorageDeviceget> pageInfo = new PageInfo<StorageDeviceget>(list);
         return pageInfo;
     }

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

@@ -78,22 +78,6 @@ public class StorageDeviceInputController {
         
         PageHelper.startPage(pageNum, pageSize);
         List<StorageDeviceinput> list = deviceInputService.queryByDevice(storageDeviceinputExample);
-        if(list.size()>0 && list!=null){
-        	
-        	for (StorageDeviceinput storageDeviceinput : list) {
-        		if(orgName!=null){
-        			storageDeviceinput.setOrgName(orgName);
-        		}
-        		if(storageDeviceinput.getPosition()!=null){
-        			BasicEquipmentEquipmentPool equipmentEquipmentPool=poolServivce.findByIdObj(Integer.parseInt(storageDeviceinput.getPosition()));
-        			if(equipmentEquipmentPool!=null){
-        				storageDeviceinput.setPositionName(equipmentEquipmentPool.getPutPosition());
-        			}
-        			
-        		}
-        	}
-        }
-        
         PageInfo<StorageDeviceinput> pageInfo = new PageInfo<StorageDeviceinput>(list);
         return pageInfo;
     }

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

@@ -81,16 +81,6 @@ public class StorageDeviceKeepController {
             PageHelper.startPage(pageNum, pageSize);
         }
         List<StorageDevicekeep> list = deviceKeepService.queryByDevice(storageDevicekeepExample);
-        if(list!=null && list.size()>0){
-        	for (StorageDevicekeep storageDevicekeep : list) {
-        		/*UserInfo userInfo =(UserInfo) request.getSession().getAttribute("userInfo");
-       	   if(userInfo.getOrgId()!=null){
-        		OrgInfo orgInfo = orgInfoService.findById(userInfo.getOrgId());
-        		storageDevicekeep.setOrgName(orgInfo.getOrgName());
-        	}*/
-        		storageDevicekeep.setOrgName(orgName);
-        	}
-        }
         PageInfo<StorageDevicekeep> pageInfo = new PageInfo<StorageDevicekeep>(list);
         return pageInfo;
     }

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

@@ -70,16 +70,6 @@ public class StorageDeviceRepairController {
             PageHelper.startPage(pageNum, pageSize);
         }
         List<StorageDevicerepair> list = deviceRepairService.queryByDevice(storageDevicerepairExample);
-        if(list!=null && list.size()>0){
-        	for (StorageDevicerepair storageDevicerepair : list) {
-        		/*UserInfo userInfo =(UserInfo) request.getSession().getAttribute("userInfo");
-        	   if(userInfo.getOrgId()!=null){
-         		OrgInfo orgInfo = orgInfoService.findById(userInfo.getOrgId());
-         		storageDevicerepair.setOrgName(orgInfo.getOrgName());
-         	}*/
-        		storageDevicerepair.setOrgName(orgName);
-        	}
-        }
         PageInfo<StorageDevicerepair> pageInfo = new PageInfo<StorageDevicerepair>(list);
         return pageInfo;
     }