,

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

@@ -59,12 +59,13 @@ public class StorageDeviceCheckController {
         if (pageNum!=null && pageSize!=null) PageHelper.startPage(pageNum, pageSize);
 
         List<StorageDevicecheck> list = storageDeviceCheckService.queryByExample(storageDevicecheckExample);
-
-        for (StorageDevicecheck storageDevicecheck : list) {
-            if(storageDevicecheck.getDepotId()!=null){
-                BasicEquipmentEquipmentPool equipmentPool=equipmentPoolService.findByIdObj(storageDevicecheck.getDepotId());
-                if(equipmentPool != null) storageDevicecheck.setDepotName(equipmentPool.getPutPosition());
-            }
+        if(list!=null && list.size()>0){
+        	for (StorageDevicecheck storageDevicecheck : list) {
+        		if(storageDevicecheck.getDepotId()!=null){
+        			BasicEquipmentEquipmentPool equipmentPool=equipmentPoolService.findByIdObj(storageDevicecheck.getDepotId());
+        			if(equipmentPool != null) storageDevicecheck.setDepotName(equipmentPool.getPutPosition());
+        		}
+        	}
         }
 
         PageInfo<StorageDevicecheck> pageInfo = new PageInfo<StorageDevicecheck>(list);

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

@@ -88,16 +88,17 @@ public class StorageDeviceGetController {
    
         PageHelper.startPage(pageNum, pageSize);
         List<StorageDeviceget> list = deviceGetService.queryByDevice(storageDevicegetExample);
-       
-        for (StorageDeviceget storageDeviceget : list) {
-        	
-        	/*UserInfo userInfo =(UserInfo) request.getSession().getAttribute("userInfo");
+       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);
-        }
+    		   storageDeviceget.setOrgName(orgName);
+    	   }
+       }
         PageInfo<StorageDeviceget> pageInfo = new PageInfo<StorageDeviceget>(list);
         return pageInfo;
     }

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

@@ -78,18 +78,21 @@ public class StorageDeviceInputController {
         
         PageHelper.startPage(pageNum, pageSize);
         List<StorageDeviceinput> list = deviceInputService.queryByDevice(storageDeviceinputExample);
-         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());
-    			 }
-
-        	 }
-		}
+        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,14 +81,16 @@ public class StorageDeviceKeepController {
             PageHelper.startPage(pageNum, pageSize);
         }
         List<StorageDevicekeep> list = deviceKeepService.queryByDevice(storageDevicekeepExample);
-        for (StorageDevicekeep storageDevicekeep : list) {
-			/*UserInfo userInfo =(UserInfo) request.getSession().getAttribute("userInfo");
+        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);
-		}
+        		storageDevicekeep.setOrgName(orgName);
+        	}
+        }
         PageInfo<StorageDevicekeep> pageInfo = new PageInfo<StorageDevicekeep>(list);
         return pageInfo;
     }

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

@@ -70,15 +70,16 @@ public class StorageDeviceRepairController {
             PageHelper.startPage(pageNum, pageSize);
         }
         List<StorageDevicerepair> list = deviceRepairService.queryByDevice(storageDevicerepairExample);
-
-        for (StorageDevicerepair storageDevicerepair : list) {
-        	/*UserInfo userInfo =(UserInfo) request.getSession().getAttribute("userInfo");
+        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);
-		}
+        		storageDevicerepair.setOrgName(orgName);
+        	}
+        }
         PageInfo<StorageDevicerepair> pageInfo = new PageInfo<StorageDevicerepair>(list);
         return pageInfo;
     }