fix：解决立库库位管理导出报错；

周鸿
1 parent 4219a604
Showing 1 changed file with 11 additions and 7 deletions
src/main/java/com/huaheng/pc/config/location/controller/LocationController.java
@@ -462,7 +462,7 @@ public class LocationController extends BaseController {
                 .orderByDesc(Location::getId);
  
         //获取库位对应的库龄map
-        Map<String, LocationAge>locationAgeMap=locationService.getLkLocationAgeMap();
+        Map<String, LocationAge> locationAgeMap=locationService.getLkLocationAgeMap();
         if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
             /*使用分页查询*/
             Page<Location> page = new Page<>(pageNum, pageSize);
@@ -473,9 +473,11 @@ public class LocationController extends BaseController {
                             Container container = containerService.getContainerByCode(l.getContainerCode(), ShiroUtils.getWarehouseCode());
                             l.setContainerHigh(container.getHeight());
                             LocationAge locationAge =locationAgeMap.get(l.getCode());
-                            l.setAge(locationAge.getAge());
-                            l.setCompanyCode(locationAge.getCompanyCode());
-                            l.setUWarehouseCode(locationAge.getUWarehouseCode());
+                            if(locationAge!=null){
+                                l.setAge(locationAge.getAge());
+                                l.setCompanyCode(locationAge.getCompanyCode());
+                                l.setUWarehouseCode(locationAge.getUWarehouseCode());
+                            }
                         }
                     }
             );
@@ -496,9 +498,11 @@ public class LocationController extends BaseController {
                             Container container = containerService.getContainerByCode(l.getContainerCode(), ShiroUtils.getWarehouseCode());
                             l.setContainerHigh(container.getHeight());
                             LocationAge locationAge =locationAgeMap.get(l.getCode());
-                            l.setAge(locationAge.getAge());
-                            l.setCompanyCode(locationAge.getCompanyCode());
-                            l.setUWarehouseCode(locationAge.getUWarehouseCode());
+                            if(locationAge!=null){
+                                l.setAge(locationAge.getAge());
+                                l.setCompanyCode(locationAge.getCompanyCode());
+                                l.setUWarehouseCode(locationAge.getUWarehouseCode());
+                            }
                         }
                     }
             );